Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2.5: merge with trunk, previous merge was only up to yesterday.

Browse Source 
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD
This commit is contained in:
Brecht Van Lommel
2008-11-12 22:03:11 +00:00
parent bdfe7d89e2 7e4db234ce
commit b3c238e8bc
47 changed files with 3141 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/win32-mingw-config.py
View File

@@ -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'