soc-2008-mxcurioni: swig compiles as independent library

[blender.git] / intern / SConscript

diff --git a/intern/SConscript b/intern/SConscript
index ec6a61f6c71da1dc8de5f807d357cfd96ea87ba8..f6092b7bd0299dc078f2bd94492217aeb48c20e9 100644 (file)
--- a/intern/SConscript
+++ b/intern/SConscript
@@ -1,4 +1,6 @@
 #!/usr/bin/python
+Import ('env')
+
 SConscript(['SoundSystem/SConscript',
             'string/SConscript',
             'ghost/SConscript',
@@ -10,12 +12,18 @@ SConscript(['SoundSystem/SConscript',
             'decimation/SConscript',
             'iksolver/SConscript',
             'boolop/SConscript',
-            'elbeem/SConscript',
             'opennl/SConscript'])
 
+# NEW_CSG was intended for intern/csg, but
+# getting it to compile is difficult
+# intern/bsp has been used anyway, so
+# perhaps get rid of intern/csg?
 NEW_CSG='false'
 
+if env['BF_NO_ELBEEM'] == 0:
+    SConscript(['elbeem/SConscript'])
+
 if NEW_CSG=='false':
-       SConscript(['bsp/SConscript'])
+    SConscript(['bsp/SConscript'])
 else:
-       SConscript(['csg/SConscript'])
+    SConscript(['csg/SConscript'])