* fixes for compiling with scons/mingw when BF_DEBUG=1. Needs svn up in lib/windows...
authorNathan Letwory <nathan@letworyinteractive.com>
Wed, 23 Sep 2009 12:10:56 +0000 (12:10 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Wed, 23 Sep 2009 12:10:56 +0000 (12:10 +0000)
SConstruct
config/win32-mingw-config.py
config/win32-vc-config.py
config/win64-vc-config.py
tools/btools.py

index 402bf18faf5fa89e3db62d237416f1d48a102dd9..7e3d23970cbaeb72c5f53580587ef0088feceef8 100644 (file)
@@ -583,9 +583,9 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'):
                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
index 04e9f5eb4d18223e9041c0ac5a7e26067d0cf727..6b10b410715514863e7f4dec5be6bb75722c2a86 100644 (file)
@@ -6,7 +6,8 @@ BF_PYTHON_VERSION = '3.1'
 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'
 
index 4f2af93d0e33d29f5ce33c4415a3ecf8a1607b98..291aa023ec86410037f8e20043b55a909f5e93dd 100644 (file)
@@ -13,6 +13,7 @@ BF_PYTHON_VERSION = '3.1'
 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
index b48e3875dd5b9d5ba1f8954c50b12dc9cdf6b152..5bb01ff16b581c43f199c79369cb1db54ae2d8ee 100644 (file)
@@ -13,6 +13,7 @@ BF_PYTHON_VERSION = '3.1'
 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 
index 771c67aee1f0567f655a6340ea6d936222a5c2ef..e3f3827ff4539f77654ceca6b91d39a8f0c539e6 100755 (executable)
@@ -27,7 +27,7 @@ def print_arguments(args, bc):
 
 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 @@ def read_opts(cfg, args):
                ('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', ''),