fix luaenginec Windows, fix nsis

This commit is contained in:
Syping 2019-10-18 15:46:41 +02:00
parent 6c76172378
commit e1c5e46af5
3 changed files with 9 additions and 5 deletions

View file

@ -13,7 +13,8 @@
!define REG_ROOT "HKLM" !define REG_ROOT "HKLM"
!define REG_APP_RUNTIME "Software\Microsoft\Windows\CurrentVersion\App Paths\${MAIN_APP_RUNTIME}" !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_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 UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
!define LICENSE_TXT "LICENSE" !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_RUNTIME}" "" "$INSTDIR\${MAIN_APP_RUNTIME}"
WriteRegStr ${REG_ROOT} "${REG_APP_COMPILER}" "" "$INSTDIR\${MAIN_APP_COMPILER}" 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}" "DisplayName" "${APP_NAME}"
WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe"
WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\${MAIN_APP_RUNTIME}" 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_RUNTIME}"
DeleteRegKey ${REG_ROOT} "${REG_APP_COMPILER}" 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}" DeleteRegKey ${REG_ROOT} "${UNINSTALL_PATH}"
SectionEnd SectionEnd

View file

@ -19,6 +19,7 @@ QT += widgets
TARGET = luaengine TARGET = luaengine
win32: TARGET = LuaEngine win32: TARGET = LuaEngine
CONFIG += c++11 CONFIG += c++11
VERSION = 0.1
static: DEFINES += LUAENGINE_STATIC static: DEFINES += LUAENGINE_STATIC
@ -52,6 +53,6 @@ win32 {
RC_LANG = 0x0 RC_LANG = 0x0
QMAKE_TARGET_COMPANY = "Syping" QMAKE_TARGET_COMPANY = "Syping"
QMAKE_TARGET_DESCRIPTION = "LuaEngine Runtime" QMAKE_TARGET_DESCRIPTION = "LuaEngine Runtime"
QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2018-2019 Syping" QMAKE_TARGET_COPYRIGHT = "Copyright (c) 2019 Syping"
QMAKE_TARGET_PRODUCT = "LuaEngine" QMAKE_TARGET_PRODUCT = "LuaEngine"
} }

View file

@ -17,7 +17,9 @@
QT -= gui QT -= gui
TARGET = luaenginec TARGET = luaenginec
CONFIG += c++11 CONFIG += c++11 \
console
VERSION = 0.1
static: DEFINES += LUAENGINE_STATIC static: DEFINES += LUAENGINE_STATIC