[GRASS-SVN] r60867 - grass/branches/releasebranch_6_4/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-06-18 12:07:02 -0700 (Wed, 18 Jun 2014)
New Revision: 60867

Modified:
   grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl
Log:
wingrass: fix msvcrt path (32bit)

Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl	2014-06-18 17:54:55 UTC (rev 60866)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl	2014-06-18 19:07:02 UTC (rev 60867)
@@ -40,6 +40,11 @@
         !define GRASS_COMMAND "grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at svn"
 !endif
 
+; Platform
+; TODO: Support 64bit (x86_64)
+; Related problem: hardcoded C:\OSGeo4W (X C:\OSGeo4W64)
+!define PLATFORM "x86"
+
 ;----------------------------------------------------------------------------------------------------------------------------
 
 ;Don't modify the following lines
@@ -948,8 +953,8 @@
 	;Set the size (in KB) of the unpacked archive file
 	AddSize 13500
 	
-	StrCpy $HTTP_PATH "http://download.osgeo.org/osgeo4w/release/msvcrt/"
-	StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-8.tar.bz2"
+	StrCpy $HTTP_PATH "http://download.osgeo.org/osgeo4w/${PLATFORM}/release/msvcrt/"
+	StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-11.tar.bz2"
 	StrCpy $EXTENDED_ARCHIVE_NAME "Microsoft Visual C++ Redistributable Packages"
 	StrCpy $ORIGINAL_UNTAR_FOLDER "install_msruntime"