diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-01-31 02:54:43 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-01-31 02:54:43 +0000 |
| commit | 64dd6c27a73a09c8b98fa84c394ecd341b0ee052 (patch) | |
| tree | 56c59e9d2a2c6cf75d60c605e0b08e739f5705dc | |
| parent | Fix constrained snapping in node tool. (diff) | |
| download | inkscape-64dd6c27a73a09c8b98fa84c394ecd341b0ee052.tar.gz inkscape-64dd6c27a73a09c8b98fa84c394ecd341b0ee052.zip | |
Tweak build.xml DLL names to match upgraded devlibs
(bzr r9036)
| -rw-r--r-- | build.xml | 4 | ||||
| -rwxr-xr-x | mingwenv.bat | 12 |
2 files changed, 7 insertions, 9 deletions
@@ -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 75f6f82dd..63e5fd988 100755 --- 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% |