diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 01:03:11 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 01:03:11 +0300 |
commit | b3c238e8bc4c38a8f2ba483be2d19c76d03d674c (patch) | |
tree | a86991622fa5582498612cf348d0de58af048a08 /config | |
parent | bdfe7d89e2f1292644577972c716931b4ce3c6c3 (diff) | |
parent | 7e4db234cee71ead34ee81a12e27da4bd548eb4b (diff) |
2.5: merge with trunk, previous merge was only up to yesterday.
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD
Diffstat (limited to 'config')
-rw-r--r-- | config/win32-mingw-config.py | 4 | ||||
-rw-r--r-- | config/win32-vc-config.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 15bfce80f89..22666851f28 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -9,7 +9,7 @@ BF_PYTHON_VERSION = '2.5' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' BF_PYTHON_BINARY = 'python' BF_PYTHON_LIB = 'python25' -BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' +BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/lib25_vs2005' WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = False @@ -64,6 +64,8 @@ BF_PNG_LIBPATH = '${BF_PNG}/lib' BF_TIFF = LIBDIR + '/tiff' BF_TIFF_INC = '${BF_TIFF}/include' +BF_TIFF_LIB = 'libtiff' +BF_TIFF_LIBPATH = '${BF_TIFF}/lib' WITH_BF_ZLIB = True BF_ZLIB = LIBDIR + '/zlib' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 9a41f7ee557..fe51abe0a89 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -77,6 +77,8 @@ BF_PNG_LIBPATH = '${BF_PNG}/lib' BF_TIFF = LIBDIR + '/tiff' BF_TIFF_INC = '${BF_TIFF}/include' +BF_TIFF_LIB = 'libtiff' +BF_TIFF_LIBPATH = '${BF_TIFF}/lib' WITH_BF_ZLIB = True BF_ZLIB = LIBDIR + '/zlib' |