archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

SCons

Browse Source 
* 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.
This commit is contained in:
Nathan Letwory
2009-07-16 19:41:28 +00:00
parent 730f319130
commit 2e854ec7cf
22 changed files with 62 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/Blender.py
View File

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