瀏覽代碼

wingrass: re-enable LAS support on 64bit
(merge https://trac.osgeo.org/grass/changeset/71392 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@71401 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 7 年之前
父節點
當前提交
9878736ac8
共有 1 個文件被更改,包括 7 次插入4 次删除
  1. 7 4
      mswindows/osgeo4w/package.sh

+ 7 - 4
mswindows/osgeo4w/package.sh

@@ -160,8 +160,12 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 
 	if [ "$MINGW_POSTFIX" = "64" ]; then
 	    conf_host=x86_64-w64-mingw32
+            # see https://trac.osgeo.org/osgeo4w/ticket/539#ticket
+            # LAS support only enabled on 64bit
+            conf_opts="--with-liblas=$PWD/mswindows/osgeo4w/liblas-config"
 	else
 	    conf_host=i386-w64-mingw32
+            conf_opts=
 	fi
 	
 	log configure
@@ -189,10 +193,9 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 		--with-odbc \
 	        --with-cairo \
                 --with-postgres \
-	        --with-opengl=windows
-        
-# see https://trac.osgeo.org/osgeo4w/ticket/539#ticket
-# --with-liblas=$PWD/mswindows/osgeo4w/liblas-config
+	        --with-opengl=windows \
+                $conf_opts
+
 	touch mswindows/osgeo4w/configure-stamp
 fi