Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Selten <michel@mselten.demon.nl>2004-02-15 22:25:32 +0300
committerMichel Selten <michel@mselten.demon.nl>2004-02-15 22:25:32 +0300
commit9330e553e88fe77b3a08cfac3a13046031b58e56 (patch)
tree69b9155aad185dc347bef0dcffaf8c538980fb72 /source/gameengine/SConscript
parent2fbf2b3775405566eb5906da2c7223eb9b626427 (diff)
SCons updates
* libraries are now generated in [BUILD_DIR]/lib * passed the user_options to all libraries now. This means I could remove a couple of Export/Import lines. * Changed the order in source/blender/src/SConscript and source/gameengine/SConscript. All libraries are now sorted alphabetically. This has no impact on the build process.
Diffstat (limited to 'source/gameengine/SConscript')
-rw-r--r--source/gameengine/SConscript17
1 files changed, 8 insertions, 9 deletions
diff --git a/source/gameengine/SConscript b/source/gameengine/SConscript
index 9ae0df1a8aa..1984c121b00 100644
--- a/source/gameengine/SConscript
+++ b/source/gameengine/SConscript
@@ -1,22 +1,21 @@
-Import ('use_ode')
-Import ('use_sumo')
+Import ('user_options_dict')
-SConscript(['Ketsji/SConscript',
- 'Ketsji/KXNetwork/SConscript',
- 'Expressions/SConscript',
- 'BlenderRoutines/SConscript',
+SConscript(['BlenderRoutines/SConscript',
'Converter/SConscript',
+ 'Expressions/SConscript',
+ 'GameLogic/SConscript',
+ 'Ketsji/SConscript',
+ 'Ketsji/KXNetwork/SConscript',
'Network/SConscript',
'Network/LoopBackNetwork/SConscript',
- 'GameLogic/SConscript',
'Physics/common/SConscript',
'Physics/Dummy/SConscript',
'Rasterizer/SConscript',
'Rasterizer/RAS_OpenGLRasterizer/SConscript',
'SceneGraph/SConscript'])
-if use_sumo == 'true':
+if user_options_dict['USE_PHYSICS'] == 'solid':
SConscript(['Physics/Sumo/SConscript'])
-if use_ode == 'true':
+if user_options_dict['USE_PHYSICS'] == 'ode':
SConscript(['Physics/BlOde/SConscript'])