浏览代码

wingrass: attempt to fix mklibs.sh for X64

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@67388 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 9 年之前
父节点
当前提交
2406b14b20
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      mswindows/osgeo4w/mklibs.sh

+ 2 - 2
mswindows/osgeo4w/mklibs.sh

@@ -36,9 +36,9 @@ for dllfile in "$@"; do
 
 	(cd $dlldir; dumpbin -exports $dllfile) |
 		sed -nf mswindows/osgeo4w/mklibs.sed |
-		egrep -v "^[ 	]*(_IMPORT_DESCRIPTOR_.*|_NULL_IMPORT_DESCRIPTOR)$" >mswindows/osgeo4w/vc/${defname%$VERSION}
+		egrep -v "^[	 ]*(_+IMPORT_DESCRIPTOR_.*|_+NULL_IMPORT_DESCRIPTOR)$" >mswindows/osgeo4w/vc/${defname%$VERSION}
 
 	(cd mswindows/osgeo4w/vc ;
-	    lib -nologo -def:${defname} -subsystem:windows -machine:${MACHINE} ;
+	    lib -nologo -def:${defname} -subsystem:windows -machine:${MACHINE}
 	    lib -nologo $libname || exit)
 done