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 /source/blender | |
| 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 'source/blender')
| -rw-r--r-- | source/blender/editors/space_node/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/python/SConscript | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript index ad57970950d..5453aa7dd44 100644 --- a/source/blender/editors/space_node/SConscript +++ b/source/blender/editors/space_node/SConscript @@ -8,7 +8,7 @@ incs += ' ../../nodes ../../render/extern/include' incs += ' ../../windowmanager #intern/guardedalloc #extern/glew/include' defs = [] cf = [] -if env['OURPLATFORM'] == 'win32-vc': +if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): #cf.append('/WX') pass if env['CC'] == 'gcc': diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 7cd3fde21be..c10b907d04e 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -86,7 +86,7 @@ if env['BF_PROFILE']: if env['BF_DEBUG']: makesrna_tool.Append(CFLAGS = env['BF_DEBUG_CFLAGS']) makesrna_tool.Append(CCFLAGS = env['BF_DEBUG_CCFLAGS']) - if env['OURPLATFORM'] == 'win32-vc': + if env['OURPLATFORM'] in ('win32-vc','win64-vc'): makesrna_tool.Append(LINKFLAGS = ['/DEBUG','/PDB:makesrna.pdb']) targetpath = root_build_dir+'/makesrna' diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 73dc171fc3e..d44cf762a0f 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -10,8 +10,8 @@ incs += ' ' + env['BF_PYTHON_INC'] defs = [] -if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc') and env['BF_DEBUG']: - defs.append('Py_TRACE_REFS') +if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc','win64-vc') and env['BF_DEBUG']: + defs.append('_DEBUG') env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [140]) |