Revision: 18049
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18049
Author: jesterking
Date: 2008-12-24 22:33:51 +0100 (Wed, 24 Dec 2008)
Log Message:
-----------
2.5 / SCons / BGE
* this should bring back BGE with scons building. Tested on scons/msvc, will
test scons/gcc in a bit
NOTE: this is not WITH_BF_PLAYER yet.
Modified Paths:
--------------
branches/blender2.5/blender/extern/qhull/SConscript
branches/blender2.5/blender/extern/solid/SConscript
branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript
branches/blender2.5/blender/source/gameengine/Converter/SConscript
branches/blender2.5/blender/source/gameengine/Expressions/SConscript
branches/blender2.5/blender/source/gameengine/GameLogic/SConscript
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/SConscript
branches/blender2.5/blender/source/gameengine/Ketsji/SConscript
branches/blender2.5/blender/source/gameengine/Network/LoopBackNetwork/SConscript
branches/blender2.5/blender/source/gameengine/Network/SConscript
branches/blender2.5/blender/source/gameengine/Physics/Bullet/SConscript
branches/blender2.5/blender/source/gameengine/Physics/Dummy/SConscript
branches/blender2.5/blender/source/gameengine/Physics/Sumo/SConscript
branches/blender2.5/blender/source/gameengine/Physics/common/SConscript
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/blender2.5/blender/source/gameengine/Rasterizer/SConscript
branches/blender2.5/blender/source/gameengine/SConscript
branches/blender2.5/blender/source/gameengine/SceneGraph/SConscript
branches/blender2.5/blender/source/gameengine/VideoTexture/SConscript
Modified: branches/blender2.5/blender/extern/qhull/SConscript
===================================================================
--- branches/blender2.5/blender/extern/qhull/SConscript 2008-12-24 21:23:07 UTC
(rev 18048)
+++ branches/blender2.5/blender/extern/qhull/SConscript 2008-12-24 21:33:51 UTC
(rev 18049)
@@ -32,4 +32,4 @@
incs = 'include src'
-env.BlenderLib ( 'extern_qhull', sources, Split(incs), Split(defs),
libtype=['game2','player'], priority=[50, 85], compileflags = cflags)
+env.BlenderLib ( 'extern_qhull', sources, Split(incs), Split(defs),
libtype=['extern'], priority=[50], compileflags = cflags)
Modified: branches/blender2.5/blender/extern/solid/SConscript
===================================================================
--- branches/blender2.5/blender/extern/solid/SConscript 2008-12-24 21:23:07 UTC
(rev 18048)
+++ branches/blender2.5/blender/extern/solid/SConscript 2008-12-24 21:33:51 UTC
(rev 18049)
@@ -31,4 +31,4 @@
incs = 'include src src/broad src/complex src/convex ../qhull/include'
-env.BlenderLib ( libname='extern_solid', sources=sources,
includes=Split(incs), defines=Split(defs), libtype=['game2','player'],
priority=[45, 75] , compileflags = cflags)
+env.BlenderLib ( libname='extern_solid', sources=sources,
includes=Split(incs), defines=Split(defs), libtype=['extern'], priority=[10] ,
compileflags = cflags)
Modified:
branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript
===================================================================
--- branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript
2008-12-24 21:23:07 UTC (rev 18048)
+++ branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript
2008-12-24 21:33:51 UTC (rev 18049)
@@ -27,4 +27,4 @@
if env['OURPLATFORM']=='win32-vc':
cxxflags.append ('/GR')
-env.BlenderLib ( 'bf_bloutines', sources, Split(incs), [], libtype=['game',
'game2', 'player'], priority=[0, 0, 45] , compileflags=cxxflags)
+env.BlenderLib ( 'bf_bloutines', sources, Split(incs), [], libtype=['core',
'player'], priority=[300, 45] , compileflags=cxxflags)
Modified: branches/blender2.5/blender/source/gameengine/Converter/SConscript
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/SConscript
2008-12-24 21:23:07 UTC (rev 18048)
+++ branches/blender2.5/blender/source/gameengine/Converter/SConscript
2008-12-24 21:33:51 UTC (rev 18049)
@@ -23,4 +23,4 @@
incs += ' ' + env['BF_SOLID_INC']
incs += ' ' + env['BF_BULLET_INC']
-env.BlenderLib ( 'bf_converter', sources, Split(incs), [],
libtype=['game','player'], priority=[5,50] )
+env.BlenderLib ( 'bf_converter', sources, Split(incs), [],
libtype=['core','player'], priority=[305,50] )
Modified: branches/blender2.5/blender/source/gameengine/Expressions/SConscript
===================================================================
--- branches/blender2.5/blender/source/gameengine/Expressions/SConscript
2008-12-24 21:23:07 UTC (rev 18048)
+++ branches/blender2.5/blender/source/gameengine/Expressions/SConscript
2008-12-24 21:33:51 UTC (rev 18049)
@@ -6,4 +6,4 @@
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,120] )
+env.BlenderLib ( 'bf_expressions', sources, Split(incs), [],
libtype=['core','player'], priority = [310,120] )
Modified: branches/blender2.5/blender/source/gameengine/GameLogic/SConscript
===================================================================
--- branches/blender2.5/blender/source/gameengine/GameLogic/SConscript
2008-12-24 21:23:07 UTC (rev 18048)
+++ branches/blender2.5/blender/source/gameengine/GameLogic/SConscript
2008-12-24 21:33:51 UTC (rev 18049)
@@ -17,4 +17,4 @@
else:
defs += ' DISABLE_SDL'
-env.BlenderLib ( 'bf_logic', sources, Split(incs), Split(defs),
libtype=['game','player'], priority=[30, 100] )
+env.BlenderLib ( 'bf_logic', sources, Split(incs), Split(defs),
libtype=['core','player'], priority=[315, 100] )
Modified:
branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/SConscript
===================================================================
--- branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/SConscript
2008-12-24 21:23:07 UTC (rev 18048)
+++ branches/blender2.5/blender/source/gameengine/Ketsji/KXNetwork/SConscript
2008-12-24 21:33:51 UTC (rev 18049)
@@ -9,4 +9,4 @@
incs += ' ' + env['BF_PYTHON_INC']
-env.BlenderLib ( 'kx_network', Split(sources), Split(incs),
defines=[],libtype=['game2', 'player'], priority=[5, 145] )
+env.BlenderLib ( 'kx_network', Split(sources), Split(incs),
defines=[],libtype=['core', 'player'], priority=[400, 145] )
Modified: branches/blender2.5/blender/source/gameengine/Ketsji/SConscript
===================================================================
--- branches/blender2.5/blender/source/gameengine/Ketsji/SConscript
2008-12-24 21:23:07 UTC (rev 18048)
+++ branches/blender2.5/blender/source/gameengine/Ketsji/SConscript
2008-12-24 21:33:51 UTC (rev 18049)
@@ -48,4 +48,4 @@
if env['WITH_BF_SDL']:
incs += ' ' + env['BF_SDL_INC']
-env.BlenderLib ( 'bf_ketsji', sources, Split(incs), [],
libtype=['game','player'], priority=[25, 60], compileflags = cflags )
+env.BlenderLib ( 'bf_ketsji', sources, Split(incs), [],
libtype=['core','player'], priority=[320, 60], compileflags = cflags )
Modified:
branches/blender2.5/blender/source/gameengine/Network/LoopBackNetwork/SConscript
===================================================================
---
branches/blender2.5/blender/source/gameengine/Network/LoopBackNetwork/SConscript
2008-12-24 21:23:07 UTC (rev 18048)
+++
branches/blender2.5/blender/source/gameengine/Network/LoopBackNetwork/SConscript
2008-12-24 21:33:51 UTC (rev 18049)
@@ -5,4 +5,4 @@
incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Network'
-env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs),
defines=[],libtype=['game2', 'player'], priority=[35, 155] )
+env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs),
defines=[],libtype=['core', 'player'], priority=[400, 155] )
Modified: branches/blender2.5/blender/source/gameengine/Network/SConscript
===================================================================
--- branches/blender2.5/blender/source/gameengine/Network/SConscript
2008-12-24 21:23:07 UTC (rev 18048)
+++ branches/blender2.5/blender/source/gameengine/Network/SConscript
2008-12-24 21:33:51 UTC (rev 18049)
@@ -5,4 +5,4 @@
incs = '. #source/kernel/gen_system #intern/string #intern/moto/include'
-env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['game2',
'player'], priority=[15, 150] )
+env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), [], libtype=['core',
'player'], priority=[400, 150] )
Modified:
branches/blender2.5/blender/source/gameengine/Physics/Bullet/SConscript
===================================================================
--- branches/blender2.5/blender/source/gameengine/Physics/Bullet/SConscript
2008-12-24 21:23:07 UTC (rev 18048)
+++ branches/blender2.5/blender/source/gameengine/Physics/Bullet/SConscript
2008-12-24 21:33:51 UTC (rev 18049)
@@ -12,4 +12,4 @@
cflags.append('/GR')
cflags.append('/O2')
-env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [],
libtype=['game','player'], priority=[15,80] )
+env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), [],
libtype=['core','player'], priority=[360,80] )
Modified: branches/blender2.5/blender/source/gameengine/Physics/Dummy/SConscript
===================================================================
--- branches/blender2.5/blender/source/gameengine/Physics/Dummy/SConscript
2008-12-24 21:23:07 UTC (rev 18048)
+++ branches/blender2.5/blender/source/gameengine/Physics/Dummy/SConscript
2008-12-24 21:33:51 UTC (rev 18049)
@@ -5,4 +5,4 @@
incs = '. ../common'
-env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [],
libtype=['game','player'], priority=[10,95] )
+env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), [],
libtype=['core','player'], priority=[350,95] )
Modified: branches/blender2.5/blender/source/gameengine/Physics/Sumo/SConscript
===================================================================
--- branches/blender2.5/blender/source/gameengine/Physics/Sumo/SConscript
2008-12-24 21:23:07 UTC (rev 18048)
+++ branches/blender2.5/blender/source/gameengine/Physics/Sumo/SConscript
2008-12-24 21:33:51 UTC (rev 18049)
@@ -22,4 +22,4 @@
cflags.append('/GR')
cflags.append('/O1')
-env.BlenderLib ( 'bf_sumo', sources, incs, [], libtype=['game2','player'],
priority=[40, 55] , compileflags=cflags)
+env.BlenderLib ( 'bf_sumo', sources, incs, [], libtype=['core','player'],
priority=[400, 55] , compileflags=cflags)
Modified:
branches/blender2.5/blender/source/gameengine/Physics/common/SConscript
===================================================================
--- branches/blender2.5/blender/source/gameengine/Physics/common/SConscript
2008-12-24 21:23:07 UTC (rev 18048)
+++ branches/blender2.5/blender/source/gameengine/Physics/common/SConscript
2008-12-24 21:33:51 UTC (rev 18049)
@@ -5,4 +5,4 @@
incs = '. ../Dummy #intern/moto/include'
-env.BlenderLib ( 'bf_common', Split(sources), Split(incs), [],
libtype=['game', 'game2','player'], priority=[20, 45, 90] )
+env.BlenderLib ( 'bf_common', Split(sources), Split(incs), [],
libtype=['core','player'], priority=[350, 90] )
Modified:
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
===================================================================
---
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
2008-12-24 21:23:07 UTC (rev 18048)
+++
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
2008-12-24 21:33:51 UTC (rev 18049)
@@ -6,4 +6,4 @@
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, 115] )
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
