[GRASS-SVN] r67379 - grass/branches/releasebranch_7_0/mswindows/osgeo4w
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Dec 25 14:32:25 PST 2015
Author: martinl
Date: 2015-12-25 14:32:25 -0800 (Fri, 25 Dec 2015)
New Revision: 67379
Modified:
grass/branches/releasebranch_7_0/mswindows/osgeo4w/mklibs.sh
Log:
fix machine in mklibs.sh (merge r67378 from trunk)
Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/mklibs.sh
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/mklibs.sh 2015-12-25 22:21:09 UTC (rev 67378)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/mklibs.sh 2015-12-25 22:32:25 UTC (rev 67379)
@@ -39,6 +39,6 @@
egrep -v "^[ ]*(_IMPORT_DESCRIPTOR_.*|_NULL_IMPORT_DESCRIPTOR)$" >mswindows/osgeo4w/vc/${defname%$VERSION}
(cd mswindows/osgeo4w/vc ;
- lib -nologo -def:${defname} -subsystem:windows -machine:x86 ;
+ lib -nologo -def:${defname} -subsystem:windows -machine:${MACHINE} ;
lib -nologo $libname || exit)
done
More information about the grass-commit
mailing list