diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-06-05 03:38:17 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-06-05 03:38:17 +0400 |
| commit | 35ea04cfc7fb3131659a5ec8919d42527d6f8985 (patch) | |
| tree | 95e789775722e673de1e6332f0efade88a3bc5ff /config | |
| parent | 129bee47432aec0e11660c0fa601750fe0643b88 (diff) | |
MingW (both native and cross) now use the libjpeg.lib from lib/windows. This is the compiled version from Sergey committed at r29226 (so please update your lib/windows too)
Diffstat (limited to 'config')
| -rw-r--r-- | config/linuxcross-config.py | 4 | ||||
| -rw-r--r-- | config/win32-mingw-config.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py index 0a9b6b3b54c..3cedf6cfd9a 100644 --- a/config/linuxcross-config.py +++ b/config/linuxcross-config.py @@ -65,7 +65,7 @@ WITH_BF_DDS = True WITH_BF_JPEG = True BF_JPEG = LIBDIR + '/jpeg' BF_JPEG_INC = '${BF_JPEG}/include' -BF_JPEG_LIB = 'jpeg' +BF_JPEG_LIB = 'libjpeg' BF_JPEG_LIBPATH = '${BF_JPEG}/lib' WITH_BF_PNG = True @@ -83,7 +83,7 @@ BF_TIFF_LIBPATH = '${BF_TIFF}/lib' WITH_BF_ZLIB = True BF_ZLIB = LIBDIR + '/zlib' BF_ZLIB_INC = '${BF_ZLIB}/include' -#BF_ZLIB_LIB = 'z' +BF_ZLIB_LIB = 'libz' BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib' WITH_BF_INTERNATIONAL = True diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 141658d3217..f01f9e1f753 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -64,7 +64,7 @@ WITH_BF_DDS = True WITH_BF_JPEG = True BF_JPEG = LIBDIR + '/jpeg' BF_JPEG_INC = '${BF_JPEG}/include' -BF_JPEG_LIB = 'jpeg' +BF_JPEG_LIB = 'libjpeg' BF_JPEG_LIBPATH = '${BF_JPEG}/lib' WITH_BF_PNG = True @@ -82,6 +82,7 @@ BF_TIFF_LIBPATH = '${BF_TIFF}/lib' WITH_BF_ZLIB = True BF_ZLIB = LIBDIR + '/zlib' BF_ZLIB_INC = '${BF_ZLIB}/include' +BF_ZLIB_LIB = 'libz' BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib' WITH_BF_INTERNATIONAL = True |