From e1c5e46af5bb78d419356d3ca3229b4f2342170b Mon Sep 17 00:00:00 2001 From: Syping Date: Fri, 18 Oct 2019 15:46:41 +0200 Subject: [PATCH] fix luaenginec Windows, fix nsis --- .ci/luaengine.nsi | 7 ++++--- src/luaengine/luaengine.pro | 3 ++- src/luaenginec/luaenginec.pro | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.ci/luaengine.nsi b/.ci/luaengine.nsi index 73f4155..0aaaa4a 100644 --- a/.ci/luaengine.nsi +++ b/.ci/luaengine.nsi @@ -13,7 +13,8 @@ !define REG_ROOT "HKLM" !define REG_APP_RUNTIME "Software\Microsoft\Windows\CurrentVersion\App Paths\${MAIN_APP_RUNTIME}" !define REG_APP_COMPILER "Software\Microsoft\Windows\CurrentVersion\App Paths\${MAIN_APP_COMPILER}" -!define REG_ENV_RUNTIME "System\ControlSet001\Control\Session Manager\Environment\LUAENGINE_RUNTIME" +!define REG_ENVIRONMENT "System\CurrentControlSet\Control\Session Manager\Environment" +!define REG_ENV_RUNTIME "LUAENGINE_RUNTIME" !define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" !define LICENSE_TXT "LICENSE" @@ -166,7 +167,7 @@ CreateShortCut "$SMPROGRAMS\LuaEngine\${APP_NAME} Website.lnk" "$INSTDIR\${APP_N WriteRegStr ${REG_ROOT} "${REG_APP_RUNTIME}" "" "$INSTDIR\${MAIN_APP_RUNTIME}" WriteRegStr ${REG_ROOT} "${REG_APP_COMPILER}" "" "$INSTDIR\${MAIN_APP_COMPILER}" -WriteRegStr ${REG_ROOT} "${REG_ENV_RUNTIME}" "" "$INSTDIR\${MAIN_APP_RUNTIME}" +WriteRegStr ${REG_ROOT} "${REG_ENVIRONMENT}" "LUAENGINE_RUNTIME" "$INSTDIR\${MAIN_APP_RUNTIME}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "${APP_NAME}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\${MAIN_APP_RUNTIME}" @@ -244,7 +245,7 @@ RmDir "$SMPROGRAMS\LuaEngine" DeleteRegKey ${REG_ROOT} "${REG_APP_RUNTIME}" DeleteRegKey ${REG_ROOT} "${REG_APP_COMPILER}" -DeleteRegKey ${REG_ROOT} "${REG_ENV_RUNTIME}" +DeleteRegKey ${REG_ROOT} "${REG_ENVIRONMENT}\${REG_ENV_RUNTIME}" DeleteRegKey ${REG_ROOT} "${UNINSTALL_PATH}" SectionEnd diff --git a/src/luaengine/luaengine.pro b/src/luaengine/luaengine.pro index e0d5e1b..f2b51ab 100644 --- a/src/luaengine/luaengine.pro +++ b/src/luaengine/luaengine.pro @@ -19,6 +19,7 @@ QT += widgets TARGET = luaengine win32: TARGET = LuaEngine CONFIG += c++11 +VERSION = 0.1 static: DEFINES += LUAENGINE_STATIC @@ -52,6 +53,6 @@ win32 { RC_LANG = 0x0 QMAKE_TARGET_COMPANY = "Syping" QMAKE_TARGET_DESCRIPTION = "LuaEngine Runtime" - QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2018-2019 Syping" + QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2019 Syping" QMAKE_TARGET_PRODUCT = "LuaEngine" } diff --git a/src/luaenginec/luaenginec.pro b/src/luaenginec/luaenginec.pro index cb97070..527d167 100644 --- a/src/luaenginec/luaenginec.pro +++ b/src/luaenginec/luaenginec.pro @@ -17,7 +17,9 @@ QT -= gui TARGET = luaenginec -CONFIG += c++11 +CONFIG += c++11 \ + console +VERSION = 0.1 static: DEFINES += LUAENGINE_STATIC