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 /extern | |
| 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 'extern')
| -rw-r--r-- | extern/bullet2/src/SConscript | 2 | ||||
| -rw-r--r-- | extern/libopenjpeg/SConscript | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript index bd7fb87b01f..319cc57ce55 100644 --- a/extern/bullet2/src/SConscript +++ b/extern/bullet2/src/SConscript @@ -10,7 +10,7 @@ cflags = [] if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): defs += ' WIN32 NDEBUG _WINDOWS _LIB' #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op'] - cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3'] + cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs'] elif env['OURPLATFORM']=='win32-mingw': defs += ' NDEBUG' cflags += ['-O2'] diff --git a/extern/libopenjpeg/SConscript b/extern/libopenjpeg/SConscript index 13a34bf5598..693fee15c91 100644 --- a/extern/libopenjpeg/SConscript +++ b/extern/libopenjpeg/SConscript @@ -10,14 +10,14 @@ incs = '.' flags = [] defs = [] -if env['OURPLATFORM'] == 'win32-vc': +if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): flags = [] defs.append('OPJ_STATIC') else: flags = ['-Wall', '-O3', '-ffast-math', '-std=c99'] oj_env = env.Clone() -if not env['OURPLATFORM'] == 'win32-vc': +if not env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): oj_env.Replace(CCFLAGS = '') oj_env.Replace(BF_DEBUG_FLAGS = '') |