Tweak build.xml DLL names to match upgraded devlibs

diff --git a/build.xml b/build.xml
index a8abf26c41142f44bd50720163793437788a9009..100ce449dc9169d7a00f1d8e6d942601b3ae2b4f 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -666,11 +666,11 @@
     <copy todir="${dist}" file="${devlibs}/bin/libwpg-stream-0.1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libwpd-0.8.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libwpd-stream-0.8.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/jpeg62.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libjpeg-7.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpng13.dll"/>
     <!-- GTK changed their dep file name for PNG!   :-(  -->
     <copy todir="${dist}" file="${devlibs}/bin/libpng12-0.dll"/>
-    <copy todir="${dist}" file="${devlibs}/bin/libtiff3.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libtiff-3.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/msvcr70.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/msvcr71.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/zlib1.dll"/>

diff --git a/mingwenv.bat b/mingwenv.bat
index 75f6f82dd71d3988c8b5ceef5e93c490fcb18554..63e5fd98815fcb1d94c407ec7c4c781163473219 100755 (executable)
--- a/mingwenv.bat
+++ b/mingwenv.bat
@@ -1,8 +1,6 @@
 @echo Setting environment variables for MinGw build of Inkscape
-set MINGW_BIN=c:\mingw\bin
-set CMAKE_BIN=c:\cmake\bin
-set GTK=c:/devlibs
-set GTKDOS=c:\devlibs
-set PKG_CONFIG_PATH=c:/devlibs/lib/pkgconfig
-set DEVLIBS_PATH=c:/devlibs
-set PATH=%MINGW_BIN%;%CMAKE_BIN%;%GTKDOS%\bin;%GTKDOS%\python;%PATH%
+IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs
+IF "%MINGW_PATH%"=="" set MINGW_PATH=c:\mingw
+set MINGW_BIN=%MINGW_PATH%\bin
+set PKG_CONFIG_PATH=%DEVLIBS_PATH%\lib\pkgconfig
+set PATH=%MINGW_BIN%;%DEVLIBS_PATH%\bin;%DEVLIBS_PATH%\python;%PATH%