[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29228] trunk/blender/config: MingW ( both native and cross) now use the libjpeg.lib from lib/windows.

[Nathan Letwory]

Revision: 29228
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29228
Author:   jesterking
Date:     2010-06-05 01:38:17 +0200 (Sat, 05 Jun 2010)

Log Message:
-----------
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)

Modified Paths:
--------------
    trunk/blender/config/linuxcross-config.py
    trunk/blender/config/win32-mingw-config.py

Modified: trunk/blender/config/linuxcross-config.py
===================================================================
--- trunk/blender/config/linuxcross-config.py	2010-06-04 23:29:49 UTC (rev 29227)
+++ trunk/blender/config/linuxcross-config.py	2010-06-04 23:38:17 UTC (rev 29228)
@@ -65,7 +65,7 @@
 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 @@
 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

Modified: trunk/blender/config/win32-mingw-config.py
===================================================================
--- trunk/blender/config/win32-mingw-config.py	2010-06-04 23:29:49 UTC (rev 29227)
+++ trunk/blender/config/win32-mingw-config.py	2010-06-04 23:38:17 UTC (rev 29228)
@@ -64,7 +64,7 @@
 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 @@
 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