瀏覽代碼

winGRASS: reflect recent changes in osgeo4w framework (msys-dev)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@50741 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 13 年之前
父節點
當前提交
169b502064
共有 2 個文件被更改,包括 1 次插入4 次删除
  1. 1 1
      mswindows/GRASS-Installer.nsi
  2. 0 3
      mswindows/osgeo4w/package.sh

+ 1 - 1
mswindows/GRASS-Installer.nsi

@@ -544,7 +544,7 @@ Section "GRASS" SecGRASS
 	FileWrite $0 'set GISBASE=$INSTALL_DIR$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem set path to freetype dll$\r$\n'
-	FileWrite $0 'set FREETYPEBASE=$INSTALL_DIR\extralib;$INSTALL_DIR\lib$\r$\n'
+	FileWrite $0 'set FREETYPEBASE=$INSTALL_DIR\extralib;$INSTALL_DIR\msys\bin;$INSTALL_DIR\lib$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem set dependecies path$\r$\n'
 	FileWrite $0 'set PATH=%FREETYPEBASE%;%PATH%$\r$\n'

+ 0 - 3
mswindows/osgeo4w/package.sh

@@ -184,9 +184,6 @@ if [ -n "$PACKAGE" ]; then
 	apps/grass/grass-$VERSION \
 	bin/${GRASS_EXECUTABLE}.bat.tmpl \
 	bin/${GRASS_EXECUTABLE}.tmpl \
-	bin/libintl3.dll \
-	bin/libiconv2.dll \
-	bin/regex2.dll \
 	etc/postinstall/${GRASS_EXECUTABLE}.bat \
 	etc/preremove/${GRASS_EXECUTABLE}.bat