[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23437] trunk/blender: * fixes for compiling with scons/mingw when BF_DEBUG=1.

[Nathan Letwory]

Revision: 23437
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23437
Author:   jesterking
Date:     2009-09-23 14:10:56 +0200 (Wed, 23 Sep 2009)

Log Message:
-----------
* fixes for compiling with scons/mingw when BF_DEBUG=1. Needs svn up in lib/windows, where I added necessary mingw libs.

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/config/win32-mingw-config.py
    trunk/blender/config/win32-vc-config.py
    trunk/blender/config/win64-vc-config.py
    trunk/blender/tools/btools.py

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2009-09-23 12:09:41 UTC (rev 23436)
+++ trunk/blender/SConstruct	2009-09-23 12:10:56 UTC (rev 23437)
@@ -583,9 +583,9 @@
 		dllsources.append('${LCGDIR}/release/python' + ver + '.zip')
 		dllsources.append('${LCGDIR}/release/zlib.pyd')
 		if env['BF_DEBUG']:
-			dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}_d.dll')
+			dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}_d.dll')
 		else:
-			dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}.dll')
+			dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}.dll')
 	if env['WITH_BF_ICONV']:
 		if env['OURPLATFORM'] == 'win64-vc':
 			pass # we link statically to iconv on win64

Modified: trunk/blender/config/win32-mingw-config.py
===================================================================
--- trunk/blender/config/win32-mingw-config.py	2009-09-23 12:09:41 UTC (rev 23436)
+++ trunk/blender/config/win32-mingw-config.py	2009-09-23 12:10:56 UTC (rev 23437)
@@ -6,7 +6,8 @@
 WITH_BF_STATICPYTHON = False
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}'
+BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}mw'
+BF_PYTHON_DLL = 'python31'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}.a'
 

Modified: trunk/blender/config/win32-vc-config.py
===================================================================
--- trunk/blender/config/win32-vc-config.py	2009-09-23 12:09:41 UTC (rev 23436)
+++ trunk/blender/config/win32-vc-config.py	2009-09-23 12:10:56 UTC (rev 23437)
@@ -13,6 +13,7 @@
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
 BF_PYTHON_LIB = 'python31'
+BF_PYTHON_DLL = '${BF_PYTHON_LIB}'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 WITH_BF_OPENAL = True

Modified: trunk/blender/config/win64-vc-config.py
===================================================================
--- trunk/blender/config/win64-vc-config.py	2009-09-23 12:09:41 UTC (rev 23436)
+++ trunk/blender/config/win64-vc-config.py	2009-09-23 12:10:56 UTC (rev 23437)
@@ -13,6 +13,7 @@
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
 BF_PYTHON_LIB = 'python31'
+BF_PYTHON_DLL = '${BF_PYTHON_LIB}'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 WITH_BF_OPENAL = False 

Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py	2009-09-23 12:09:41 UTC (rev 23436)
+++ trunk/blender/tools/btools.py	2009-09-23 12:10:56 UTC (rev 23437)
@@ -27,7 +27,7 @@
 
 def validate_arguments(args, bc):
 	opts_list = [
-			'WITH_BF_PYTHON', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'BF_PYTHON_LIB_STATIC',
+			'WITH_BF_PYTHON', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL',
 			'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
 			'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
 			'BF_LIBSAMPLERATE', 'BF_LIBSAMPLERATE_INC', 'BF_LIBSAMPLERATE_LIB', 'BF_LIBSAMPLERATE_LIBPATH',
@@ -158,6 +158,7 @@
 		('BF_PYTHON_INC', 'include path for Python headers', ''),
 		('BF_PYTHON_BINARY', 'Path to the Python interpreter', ''),
 		('BF_PYTHON_LIB', 'Python library', ''),
+		('BF_PYTHON_DLL', 'Python dll - used on Windows only', ''),
 		('BF_PYTHON_LIB_STATIC', 'Python static libraries', ''),
 		('BF_PYTHON_LIBPATH', 'Library path', ''),
 		('BF_PYTHON_LINKFLAGS', 'Python link flags', ''),