From f21f3cb290e221e4b4610e43c17e9702b43a1cb5 Mon Sep 17 00:00:00 2001
From: Nils Thuerey <nils@thuerey.de>
Date: Tue, 22 Aug 2006 11:18:00 +0000
Subject: - modified patch #4681, for scons compiling   of the fluidsim can now
 be disabled with the 	flag: BF_NO_ELBEEM='true', e.g. for irix systems. 
 (The number of ifdefs from the original 	patch was reduced, and the
 defines are now 	only necessary when elbeem is switched off.) -
 particle generation option is available again

---
 intern/SConscript | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'intern/SConscript')

diff --git a/intern/SConscript b/intern/SConscript
index 606a81ae923..ecb7f29fab6 100644
--- a/intern/SConscript
+++ b/intern/SConscript
@@ -1,4 +1,6 @@
 #!/usr/bin/python
+Import ('env')
+
 SConscript(['SoundSystem/SConscript',
             'string/SConscript',
             'ghost/SConscript',
@@ -10,7 +12,6 @@ SConscript(['SoundSystem/SConscript',
             'decimation/SConscript',
             'iksolver/SConscript',
             'boolop/SConscript',
-            'elbeem/SConscript',
             'opennl/SConscript'])
 
 # NEW_CSG was intended for intern/csg, but
@@ -19,6 +20,9 @@ SConscript(['SoundSystem/SConscript',
 # perhaps get rid of intern/csg?
 NEW_CSG='false'
 
+if env['BF_NO_ELBEEM'] == 'false':
+	SConscript(['elbeem/SConscript'])
+
 if NEW_CSG=='false':
 	SConscript(['bsp/SConscript'])
 else:
-- 
cgit v1.2.3