浏览代码

wingrass installer: fix platform definition

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@67134 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 9 年之前
父节点
当前提交
7c12bf9421
共有 2 个文件被更改,包括 6 次插入2 次删除
  1. 5 2
      mswindows/GRASS-Installer.nsi.tmpl
  2. 1 0
      mswindows/Makefile

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

@@ -36,8 +36,11 @@ SetCompressorDictSize 128
         !define GRASS_COMMAND "grass@GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@svn"
 !endif
 
-; Platform
-!if "%1" == "64"
+;----------------------------------------------------------------------------------------------------------------------------
+
+;Platform
+
+!if "@ARCH@" == "x86_64-w64-mingw32"
     !define PLATFORM "x86_64"
 !else
     !define PLATFORM "x86"

+ 1 - 0
mswindows/Makefile

@@ -23,4 +23,5 @@ GRASS-Installer.nsi: GRASS-Installer.nsi.tmpl
 	-e 's#@GRASS_VERSION_MAJOR@#$(GRASS_VERSION_MAJOR)#' \
 	-e 's#@GRASS_VERSION_MINOR@#$(GRASS_VERSION_MINOR)#' \
 	-e 's#@GRASS_VERSION_RELEASE@#$(GRASS_VERSION_RELEASE)#' \
+	-e 's#@ARCH@#$(ARCH)#' \
 	$< > $@