diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-07-16 23:41:28 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-07-16 23:41:28 +0400 |
| commit | 2e854ec7cfcb0a8aa78aaf58f7f4c3e79baae0e3 (patch) | |
| tree | f3ca98b664398919872220c566256e118776c28f /tools | |
| parent | 730f3191302b17e665524190b23381e1bd550792 (diff) | |
SCons
* ensure all SConscripts are ready for win64-vc (where necessary).
* ensure we have proper _DEBUG flag for Python when we're doing a debug build.
* some cleaning up of linking etc.
* ensure /EHsc is there for game engine modules.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 164a9d097e6..749fa55a833 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -448,6 +448,12 @@ class BlenderEnvironment(SConsEnvironment): lenv.Append(CFLAGS = lenv['C_WARN']) lenv.Append(CCFLAGS = lenv['CC_WARN']) lenv.Append(CXXFLAGS = lenv['CXX_WARN']) + + if lenv['OURPLATFORM'] in ('win32-vc', 'win64-vc'): + if lenv['BF_DEBUG']: + lenv.Append(CCFLAGS = ['/MTd']) + else: + lenv.Append(CCFLAGS = ['/MT']) targetdir = root_build_dir+'lib/' + libname if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): @@ -476,6 +482,7 @@ class BlenderEnvironment(SConsEnvironment): lenv = self.Clone() if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'): lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS']) + lenv.Append(LINKFLAGS = ['/FORCE:MULTIPLE']) if lenv['BF_DEBUG']: lenv.Prepend(LINKFLAGS = ['/DEBUG','/PDB:'+progname+'.pdb']) if lenv['OURPLATFORM']=='linux2': |