diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2017-05-08 21:04:48 +0200 |
|---|---|---|
| committer | Rechi <Rechi@users.noreply.github.com> | 2017-05-08 21:04:48 +0200 |
| commit | 937e38df5eb0192dee282f26365e4b841eb72724 (patch) | |
| tree | 7393de23be31aeb647dce1a6ff81690df1855eab | |
| parent | 411a35a56202c7abd26164816e22fa6ee862b5bf (diff) | |
[windows][installer] set InstallDir for x64
| -rw-r--r-- | project/Win32BuildSetup/genNsisInstaller.nsi | 5 | ||||
| -rw-r--r-- | tools/buildsteps/windows/BuildSetup.bat | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi index 0e5452a811..e33f6cfe5a 100644 --- a/project/Win32BuildSetup/genNsisInstaller.nsi +++ b/project/Win32BuildSetup/genNsisInstaller.nsi @@ -19,7 +19,11 @@ OutFile "${APP_NAME}Setup-${app_revision}-${app_branch}.exe" ;Default installation folder +!ifdef x64 + InstallDir "$PROGRAMFILES64\${APP_NAME}" +!else InstallDir "$PROGRAMFILES\${APP_NAME}" +!endif ;Get installation folder from registry if available InstallDirRegKey HKCU "Software\${APP_NAME}" "" @@ -333,6 +337,7 @@ SectionGroupEnd Function .onInit !ifdef x64 + SetRegView 64 ${IfNot} ${RunningX64} MessageBox MB_OK|MB_ICONSTOP 'This is the 64-bit ${APP_NAME} installer.$\nPlease download the 32-bit version from ${WEBSITE}.$\n$\nClick Ok to quit Setup.' Quit diff --git a/tools/buildsteps/windows/BuildSetup.bat b/tools/buildsteps/windows/BuildSetup.bat index aadfbdf50c..8ccbc2c819 100644 --- a/tools/buildsteps/windows/BuildSetup.bat +++ b/tools/buildsteps/windows/BuildSetup.bat @@ -237,7 +237,7 @@ set WORKSPACE=%base_dir%\kodi-build ) SET NSISExe=%NSISExePath%\makensis.exe - "%NSISExe%" /V1 /X"SetCompressor /FINAL lzma" /Dapp_root="%CD%\BUILD_WIN32" /DAPP_NAME="%APP_NAME%" /DTARGET_ARCHITECTURE="%TARGET_ARCHITECTURE%" /DVERSION_NUMBER="%VERSION_NUMBER%" /DCOMPANY_NAME="%COMPANY_NAME%" /DWEBSITE="%WEBSITE%" /Dapp_revision="%GIT_REV%" /Dapp_branch="%BRANCH%" "genNsisInstaller.nsi" + "%NSISExe%" /V1 /X"SetCompressor /FINAL lzma" /Dapp_root="%CD%\BUILD_WIN32" /DAPP_NAME="%APP_NAME%" /DTARGET_ARCHITECTURE="%TARGET_ARCHITECTURE%" /DVERSION_NUMBER="%VERSION_NUMBER%" /DCOMPANY_NAME="%COMPANY_NAME%" /DWEBSITE="%WEBSITE%" /Dapp_revision="%GIT_REV%" /Dapp_branch="%BRANCH%" /D%TARGET_ARCHITECTURE% "genNsisInstaller.nsi" IF NOT EXIST "%APP_SETUPFILE%" ( POPD set DIETEXT=Failed to create %APP_SETUPFILE%. NSIS installed? |