diff options
| author | Nils Thuerey <nils@thuerey.de> | 2006-08-22 15:18:00 +0400 |
|---|---|---|
| committer | Nils Thuerey <nils@thuerey.de> | 2006-08-22 15:18:00 +0400 |
| commit | f21f3cb290e221e4b4610e43c17e9702b43a1cb5 (patch) | |
| tree | e168253c66d3cc03dd83d3974168306bd5cd21ab /intern/SConscript | |
| parent | 91c9917bc00c196ce03d3662b06443c4539bc87e (diff) | |
- 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
Diffstat (limited to 'intern/SConscript')
| -rw-r--r-- | intern/SConscript | 6 |
1 files changed, 5 insertions, 1 deletions
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: |