[GRASS-SVN] r67140 - grass/trunk/mswindows
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Dec 15 02:23:48 PST 2015
Author: martinl
Date: 2015-12-15 02:23:48 -0800 (Tue, 15 Dec 2015)
New Revision: 67140
Modified:
grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
Log:
winGRASS installer: fix msvcrt path (32bit vs 64bit)
Modified: grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi.tmpl 2015-12-15 10:19:48 UTC (rev 67139)
+++ grass/trunk/mswindows/GRASS-Installer.nsi.tmpl 2015-12-15 10:23:48 UTC (rev 67140)
@@ -851,7 +851,11 @@
AddSize 13500
StrCpy $HTTP_PATH "http://download.osgeo.org/osgeo4w/${PLATFORM}/release/msvcrt/"
- StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-12.tar.bz2"
+ !if ${PLATFORM} == "x86_64"
+ StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-8.tar.bz2"
+ !else
+ StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-12.tar.bz2"
+ !endif
StrCpy $EXTENDED_ARCHIVE_NAME "Microsoft Visual C++ Redistributable Packages"
StrCpy $ORIGINAL_UNTAR_FOLDER "install_msruntime"
More information about the grass-commit
mailing list