瀏覽代碼

winGRASS installer: fix instalation dir (32bit vs 64bit)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@67139 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 9 年之前
父節點
當前提交
0749756b6a
共有 1 個文件被更改,包括 5 次插入4 次删除
  1. 5 4
      mswindows/GRASS-Installer.nsi.tmpl

+ 5 - 4
mswindows/GRASS-Installer.nsi.tmpl

@@ -38,14 +38,18 @@ SetCompressorDictSize 128
 
 ;----------------------------------------------------------------------------------------------------------------------------
 
-;Platform (and GRASS Icon)
+;Define Platform and installation folder
+
+;----------------------------------------------------------------------------------------------------------------------------
 
 !if "@ARCH@" == "x86_64-w64-mingw32"
     !define PLATFORM "x86_64"
     !define GRASS_ICON "${INSTALL_DIR}\gui\icons\grass64bit.ico"
+    InstallDir "$PROGRAMFILES64\${GRASS_BASE}"
 !else
     !define PLATFORM "x86"
     !define GRASS_ICON "${INSTALL_DIR}\gui\icons\grass.ico"
+    InstallDir "$PROGRAMFILES32\${GRASS_BASE}"
 !endif
 
 ;----------------------------------------------------------------------------------------------------------------------------
@@ -97,9 +101,6 @@ Name "${DISPLAYED_NAME}"
 ;Name of the output file (installer executable)
 OutFile "${INSTALLER_NAME}"
 
-;Define installation folder
-InstallDir "$PROGRAMFILES\${GRASS_BASE}"
-
 ;Request application privileges for Windows
 RequestExecutionLevel admin