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/gameengine/VideoTexture/SConscript | |
| 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/gameengine/VideoTexture/SConscript')
| -rw-r--r-- | source/gameengine/VideoTexture/SConscript | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/gameengine/VideoTexture/SConscript b/source/gameengine/VideoTexture/SConscript index 920da8ffb2e..fdf46f70ad7 100644 --- a/source/gameengine/VideoTexture/SConscript +++ b/source/gameengine/VideoTexture/SConscript @@ -15,19 +15,22 @@ incs += ' #source/blender/gpu #source/kernel/gen_system #intern/string #intern/m incs += ' #intern/guardedalloc #intern/SoundSystem' incs += ' #extern/glew/include' -defs = '' +defs = [] cxxflags = [] -if env['OURPLATFORM']=='win32-vc': +if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): cxxflags.append ('/GR') cxxflags.append ('/O2') + cxxflags.append ('/EHsc') + if env['BF_DEBUG']: + defs.append('_DEBUG') incs += ' ' + env['BF_PYTHON_INC'] #incs += ' ' + env['BF_OPENGL_INC'] if env['WITH_BF_FFMPEG']: - defs += ' WITH_FFMPEG' + defs.append('WITH_FFMPEG') incs += ' ' + env['BF_FFMPEG_INC'] + ' ' + env['BF_PTHREADS_INC'] - defs += ' __STDC_CONSTANT_MACROS' + defs.append('__STDC_CONSTANT_MACROS') -env.BlenderLib ( 'bf_videotex', sources, Split(incs), Split(defs), libtype=['core','player'], priority=[300, 72], cxx_compileflags = cxxflags ) +env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[300, 72], cxx_compileflags = cxxflags ) |