[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18986] trunk/blender: SCons:
Nathan Letwory
jesterking at letwory.net
Mon Feb 16 00:26:02 CET 2009
Revision: 18986
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18986
Author: jesterking
Date: 2009-02-16 00:26:00 +0100 (Mon, 16 Feb 2009)
Log Message:
-----------
SCons:
* giving compileflags, cc_compileflags and cxx_compileflags to BlenderLib() now actually overrides any other setting (so there's no unclarity when ie. conflicting options are being specified in REL_CFLAGS et al). These are set after either release or debug flags, but before any *_WARN flags (so those stay maintained).
* add cxx_compileflags for GE parts on win32-vc to have better performance.
* NOTE: if platform maintainers (OSX and Linux) could check and do the same for their systems. Not vital, but probably very, very much welcomed by GE users.
Modified Paths:
--------------
trunk/blender/extern/bullet2/src/SConscript
trunk/blender/source/gameengine/BlenderRoutines/SConscript
trunk/blender/source/gameengine/Expressions/SConscript
trunk/blender/source/gameengine/GameLogic/SConscript
trunk/blender/source/gameengine/GamePlayer/common/SConscript
trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
trunk/blender/source/gameengine/Ketsji/KXNetwork/SConscript
trunk/blender/source/gameengine/Ketsji/SConscript
trunk/blender/source/gameengine/Physics/Bullet/SConscript
trunk/blender/source/gameengine/Physics/common/SConscript
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
trunk/blender/source/gameengine/Rasterizer/SConscript
trunk/blender/source/gameengine/SceneGraph/SConscript
trunk/blender/source/gameengine/VideoTexture/SConscript
trunk/blender/tools/Blender.py
Modified: trunk/blender/extern/bullet2/src/SConscript
===================================================================
--- trunk/blender/extern/bullet2/src/SConscript 2009-02-15 19:07:27 UTC (rev 18985)
+++ trunk/blender/extern/bullet2/src/SConscript 2009-02-15 23:26:00 UTC (rev 18986)
@@ -10,7 +10,7 @@
if env['OURPLATFORM']=='win32-vc':
defs += ' WIN32 NDEBUG _WINDOWS _LIB'
#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
- cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6']
+ cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3']
elif env['OURPLATFORM']=='win32-mingw':
defs += ' NDEBUG'
cflags += ['-O2']
Modified: trunk/blender/source/gameengine/BlenderRoutines/SConscript
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/SConscript 2009-02-15 19:07:27 UTC (rev 18985)
+++ trunk/blender/source/gameengine/BlenderRoutines/SConscript 2009-02-15 23:26:00 UTC (rev 18986)
@@ -25,5 +25,6 @@
cxxflags = []
if env['OURPLATFORM']=='win32-vc':
cxxflags.append ('/GR')
+ cxxflags.append ('/O2')
-env.BlenderLib ( 'bf_bloutines', sources, Split(incs), [], libtype=['game', 'game2', 'player'], priority=[0, 0, 55] , compileflags=cxxflags)
+env.BlenderLib ( 'bf_bloutines', sources, Split(incs), [], libtype=['game', 'game2', 'player'], priority=[0, 0, 55] , cxx_compileflags=cxxflags)
Modified: trunk/blender/source/gameengine/Expressions/SConscript
===================================================================
--- trunk/blender/source/gameengine/Expressions/SConscript 2009-02-15 19:07:27 UTC (rev 18985)
+++ trunk/blender/source/gameengine/Expressions/SConscript 2009-02-15 23:26:00 UTC (rev 18986)
@@ -6,4 +6,9 @@
incs ='. #source/kernel/gen_system #intern/string #intern/moto/include'
incs += ' ' + env['BF_PYTHON_INC']
-env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['game','player'], priority = [45,125] )
+cxxflags = []
+if env['OURPLATFORM']=='win32-vc':
+ cxxflags.append ('/GR')
+ cxxflags.append ('/O2')
+
+env.BlenderLib ( 'bf_expressions', sources, Split(incs), [], libtype=['game','player'], priority = [45,125], cxx_compileflags=cxxflags)
Modified: trunk/blender/source/gameengine/GameLogic/SConscript
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SConscript 2009-02-15 19:07:27 UTC (rev 18985)
+++ trunk/blender/source/gameengine/GameLogic/SConscript 2009-02-15 23:26:00 UTC (rev 18986)
@@ -17,4 +17,9 @@
else:
defs += ' DISABLE_SDL'
-env.BlenderLib ( 'bf_logic', sources, Split(incs), Split(defs), libtype=['game','player'], priority=[30, 110] )
+cxxflags = []
+if env['OURPLATFORM']=='win32-vc':
+ cxxflags.append ('/GR')
+ cxxflags.append ('/O2')
+
+env.BlenderLib ( 'bf_logic', sources, Split(incs), Split(defs), libtype=['game','player'], priority=[30, 110], cxx_compileflags=cxxflags )
Modified: trunk/blender/source/gameengine/GamePlayer/common/SConscript
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/SConscript 2009-02-15 19:07:27 UTC (rev 18985)
+++ trunk/blender/source/gameengine/GamePlayer/common/SConscript 2009-02-15 23:26:00 UTC (rev 18986)
@@ -67,8 +67,9 @@
incs += Split(env['BF_PNG_INC'])
incs += Split(env['BF_ZLIB_INC'])
-cflags=[]
+cxxflags = []
if env['OURPLATFORM']=='win32-vc':
- cflags = ['/GR']
+ cxxflags.append ('/GR')
+ cxxflags.append ('/O2')
-env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = [], libtype='player', priority=5, compileflags=cflags)
+env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = [], libtype='player', priority=5, cxx_compileflags=cxxflags)
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/SConscript 2009-02-15 19:07:27 UTC (rev 18985)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/SConscript 2009-02-15 23:26:00 UTC (rev 18986)
@@ -45,12 +45,14 @@
incs += Split(env['BF_PYTHON_INC'])
incs += Split(env['BF_SOLID_INC'])
-cflags = []
+
+cxxflags = []
if env['OURPLATFORM']=='win32-vc':
- cflags = ['/GR']
+ cxxflags.append ('/GR')
+ cxxflags.append ('/O2')
defs = ''
if env['WITH_BF_FFMPEG']:
defs += ' WITH_FFMPEG'
-env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = Split(defs), libtype='player',priority=0, compileflags=cflags)
+env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = Split(defs), libtype='player',priority=0, cxx_compileflags=cxxflags)
Modified: trunk/blender/source/gameengine/Ketsji/KXNetwork/SConscript
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KXNetwork/SConscript 2009-02-15 19:07:27 UTC (rev 18985)
+++ trunk/blender/source/gameengine/Ketsji/KXNetwork/SConscript 2009-02-15 23:26:00 UTC (rev 18986)
@@ -9,4 +9,10 @@
incs += ' ' + env['BF_PYTHON_INC']
-env.BlenderLib ( 'kx_network', Split(sources), Split(incs), defines=[],libtype=['game2', 'player'], priority=[5, 155] )
+cxxflags = []
+if env['OURPLATFORM']=='win32-vc':
+ cxxflags.append ('/GR')
+ cxxflags.append ('/O2')
+
+
+env.BlenderLib ( 'kx_network', Split(sources), Split(incs), defines=[],libtype=['game2', 'player'], priority=[5, 155], cxx_compileflags=cxxflags )
Modified: trunk/blender/source/gameengine/Ketsji/SConscript
===================================================================
--- trunk/blender/source/gameengine/Ketsji/SConscript 2009-02-15 19:07:27 UTC (rev 18985)
+++ trunk/blender/source/gameengine/Ketsji/SConscript 2009-02-15 23:26:00 UTC (rev 18986)
@@ -34,11 +34,6 @@
incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork'
incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include #source/blender/gpu'
-cflags = []
-if env['OURPLATFORM'] == 'win32-vc':
- cflags.append('/GR')
- cflags.append('/Ox')
-
incs += ' ' + env['BF_SOLID_INC']
incs += ' ' + env['BF_PYTHON_INC']
incs += ' ' + env['BF_BULLET_INC']
@@ -47,4 +42,9 @@
if env['WITH_BF_SDL']:
incs += ' ' + env['BF_SDL_INC']
-env.BlenderLib ( 'bf_ketsji', sources, Split(incs), [], libtype=['game','player'], priority=[25, 72], compileflags = cflags )
+cxxflags = []
+if env['OURPLATFORM']=='win32-vc':
+ cxxflags.append ('/GR')
+ cxxflags.append ('/O2')
+
+env.BlenderLib ( 'bf_ketsji', sources, Split(incs), [], libtype=['game','player'], priority=[25, 72], cxx_compileflags = cxxflags )
Modified: trunk/blender/source/gameengine/Physics/Bullet/SConscript
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/SConscript 2009-02-15 19:07:27 UTC (rev 18985)
+++ trunk/blender/source/gameengine/Physics/Bullet/SConscript 2009-02-15 23:26:00 UTC (rev 18986)
@@ -7,9 +7,9 @@
incs += ' ' + env['BF_BULLET_INC']
-cflags = []
+cxxflags = []
if env['OURPLATFORM']=='win32-vc':
- cflags.append('/GR')
- cflags.append('/O2')
+ cxxflags.append ('/GR')
+ cxxflags.append ('/O2')
-env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['game','player'], priority=[15,90] )
+env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [], libtype=['game','player'], priority=[15,90], cxx_compileflags=cxxflags )
Modified: trunk/blender/source/gameengine/Physics/common/SConscript
===================================================================
--- trunk/blender/source/gameengine/Physics/common/SConscript 2009-02-15 19:07:27 UTC (rev 18985)
+++ trunk/blender/source/gameengine/Physics/common/SConscript 2009-02-15 23:26:00 UTC (rev 18986)
@@ -5,4 +5,9 @@
incs = '. ../Dummy #intern/moto/include'
-env.BlenderLib ( 'bf_common', Split(sources), Split(incs), [], libtype=['game', 'game2','player'], priority=[20, 35, 95] )
+cxxflags = []
+if env['OURPLATFORM']=='win32-vc':
+ cxxflags.append ('/GR')
+ cxxflags.append ('/O2')
+
+env.BlenderLib ( 'bf_common', Split(sources), Split(incs), [], libtype=['game', 'game2','player'], priority=[20, 35, 95], cxx_compileflags = cxxflags )
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript 2009-02-15 19:07:27 UTC (rev 18985)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript 2009-02-15 23:26:00 UTC (rev 18986)
@@ -6,4 +6,9 @@
incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Rasterizer #source/gameengine/BlenderRoutines '
incs += ' #source/blender/gpu #extern/glew/include ' + env['BF_OPENGL_INC']
-env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['game','player'], priority=[40, 120] )
+cxxflags = []
+if env['OURPLATFORM']=='win32-vc':
+ cxxflags.append ('/GR')
+ cxxflags.append ('/O2')
+
+env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['game','player'], priority=[40, 120], cxx_compileflags = cxxflags )
Modified: trunk/blender/source/gameengine/Rasterizer/SConscript
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/SConscript 2009-02-15 19:07:27 UTC (rev 18985)
+++ trunk/blender/source/gameengine/Rasterizer/SConscript 2009-02-15 23:26:00 UTC (rev 18986)
@@ -7,9 +7,9 @@
incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines #extern/glew/include #source/gameengine/Expressions #source/blender/blenkernel #source/blender/makesdna'
incs += ' ' + env['BF_PYTHON_INC']
+cxxflags = []
if env['OURPLATFORM']=='win32-vc':
- cflags = []
- cflags.append('/Ox')
- env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,115], compileflags = cflags )
-else:
- env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,115] )
+ cxxflags.append ('/GR')
+ cxxflags.append ('/O2')
+
+env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,115], cxx_compileflags = cxxflags )
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list