diff options
| -rw-r--r-- | SConstruct | 2 | ||||
| -rw-r--r-- | extern/qhull/SConscript | 2 | ||||
| -rw-r--r-- | extern/solid/SConscript | 5 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/SConscript | 3 | ||||
| -rwxr-xr-x | source/gameengine/Physics/Sumo/SConscript | 3 | ||||
| -rwxr-xr-x | source/gameengine/Rasterizer/SConscript | 4 |
6 files changed, 14 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index f29b73f39dc..78a068d7ae4 100644 --- a/SConstruct +++ b/SConstruct @@ -284,7 +284,7 @@ elif sys.platform == 'win32': build_blender_static = 'false' build_blender_player = 'false' build_blender_plugin = 'false' - release_flags = ['/G6', '/GF'] + release_flags = ['/Og', '/Ot', '/Ob1', '/Op', '/G6'] debug_flags = ['/Zi', '/Fr${TARGET.base}.sbr'] extra_flags = ['/EHsc', '/J', '/W3', '/Gd', '/MT'] cxxflags = [] diff --git a/extern/qhull/SConscript b/extern/qhull/SConscript index 22a09a99345..1be051c4623 100644 --- a/extern/qhull/SConscript +++ b/extern/qhull/SConscript @@ -8,6 +8,8 @@ Import ('defines') Import ('user_options_dict') if sys.platform=='linux2' or sys.platform=='linux-i386': qhull_env.Append (CCFLAGS = ['-O2', '-ansi']) +elif sys.platform=='win32': + qhull_env.Append (CCFLAGS = ['/O2']) elif sys.platform=='sunos': qhull_env.Append (CCFLAGS = ['Xc', '-v', '-fast']) else: diff --git a/extern/solid/SConscript b/extern/solid/SConscript index 5e55b21efec..0ea99337c05 100644 --- a/extern/solid/SConscript +++ b/extern/solid/SConscript @@ -11,8 +11,9 @@ cflags = [] cxxflags = [] if sys.platform=='win32': - defines += ['WIN32','NDEBUG', '_WINDOWS', '_LIB'] - cflags += ['/MT', '/W3', '/GX', '/O2'] + defines += ['WIN32','NDEBUG', '_WINDOWS', '_LIB'] + #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op'] + cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6'] elif sys.platform=='linux2' or sys.platform=='linux-i386': defines += ['NDEBUG'] cflags += ['-O2'] diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 8f8b868a877..3c880246338 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -103,7 +103,8 @@ ketsji_env.Append (CPPPATH = ['.', ]) if sys.platform == 'win32': - ketsji_env.Append (CXXFLAGS = ['/GR']) + ketsji_env.Append (CXXFLAGS = ['/GR']) + ketsji_env.Append ( CCFLAGS =['/Ox']) ketsji_env.Append (CPPPATH = user_options_dict['PYTHON_INCLUDE']) ketsji_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/KX_ketsji', source=source_files) diff --git a/source/gameengine/Physics/Sumo/SConscript b/source/gameengine/Physics/Sumo/SConscript index dba05693c1e..126fb43e2da 100755 --- a/source/gameengine/Physics/Sumo/SConscript +++ b/source/gameengine/Physics/Sumo/SConscript @@ -19,6 +19,7 @@ phy_sumo_env.Append (CPPPATH = ['.', phy_sumo_env.Append (CPPPATH = user_options_dict['SOLID_INCLUDE']) if sys.platform=='win32': - phy_sumo_env.Append (CXXFLAGS = ['/GR']) + phy_sumo_env.Append (CXXFLAGS = ['/GR']) + phy_sumo_env.Append ( CCFLAGS =['/O1']) phy_sumo_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/PHY_Sumo', source=source_files) diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript index 41cf80df144..96252581601 100755 --- a/source/gameengine/Rasterizer/SConscript +++ b/source/gameengine/Rasterizer/SConscript @@ -1,3 +1,4 @@ +import sys Import ('user_options_dict') Import ('library_env') @@ -19,4 +20,7 @@ ras_rasterizer_env.Append (CPPPATH=['.', '#intern/moto/include' ]) +if sys.platform=='win32': + ras_rasterizer_env.Append ( CCFLAGS =['/Ox']) + ras_rasterizer_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/RAS_rasterizer', source=source_files) |