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:
authorD.J. Capelis <blender@capelis.dj>2005-10-12 15:55:56 +0400
committerD.J. Capelis <blender@capelis.dj>2005-10-12 15:55:56 +0400
commitedad7a67b429ec3fd2de70bd0f957b0a945b5f01 (patch)
tree2523ae9f1aeff8eadb0357a7630dd60acee306fc /SConstruct
parent3c568fd3bbeaef9634f8967c8adb54fcf3680ff0 (diff)
Build system - Bug Fix/Cleanup: Moving use_fluidsim variable to platform specific section where it belongs as per ML and IRC discussion. This allows platform maintainers some flexibility in determining what should be compiling on each system. Right now fluidsim is set as true everywhere and there is no functional change from before.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct11
1 files changed, 8 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct
index c39ac6833fd..929856d1de9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -71,6 +71,7 @@ if sys.platform == 'linux2' or sys.platform == 'linux-i386':
use_ode = 'false'
use_bullet = 'false'
use_buildinfo = 'true'
+ use_fluidsim = 'true'
build_blender_dynamic = 'true'
build_blender_static = 'false'
build_blender_player = 'true'
@@ -157,6 +158,7 @@ elif sys.platform == 'darwin':
use_ode = 'false'
use_bullet = 'false'
use_buildinfo = 'true'
+ use_fluidsim = 'true'
build_blender_dynamic = 'true'
build_blender_static = 'false'
build_blender_player = 'true'
@@ -273,6 +275,7 @@ elif sys.platform == 'cygwin':
use_ode = 'false'
use_bullet = 'false'
use_buildinfo = 'false'
+ use_fluidsim = 'true'
build_blender_dynamic = 'true'
build_blender_static = 'false'
build_blender_player = 'false'
@@ -358,6 +361,7 @@ elif sys.platform == 'win32':
use_ode = 'false'
use_bullet = 'false'
use_buildinfo = 'true'
+ use_fluidsim = 'true'
build_blender_dynamic = 'true'
build_blender_static = 'false'
build_blender_player = 'true'
@@ -464,6 +468,7 @@ elif string.find (sys.platform, 'sunos') != -1:
use_ode = 'false'
use_bullet = 'false'
use_buildinfo = 'false'
+ use_fluidsim = 'true'
build_blender_dynamic = 'true'
build_blender_static = 'false'
build_blender_player = 'false'
@@ -547,6 +552,7 @@ elif string.find (sys.platform, 'irix') != -1:
use_ode = 'false'
use_bullet = 'false'
use_buildinfo = 'false'
+ use_fluidsim = 'true'
build_blender_dynamic = 'true'
build_blender_static = 'false'
build_blender_player = 'false'
@@ -642,6 +648,7 @@ elif sys.platform=='openbsd3':
use_ode = 'false'
use_bullet = 'false'
use_buildinfo = 'true'
+ use_fluidsim = 'true'
build_blender_dynamic = 'true'
build_blender_static = 'false'
build_blender_player = 'false'
@@ -726,6 +733,7 @@ elif sys.platform=='freebsd4' or sys.platform=='freebsd5':
use_ode = 'false'
use_bullet = 'false'
use_buildinfo = 'true'
+ use_fluidsim = 'true'
build_blender_dynamic = 'true'
build_blender_static = 'false'
build_blender_player = 'false'
@@ -807,9 +815,6 @@ else:
# End of platform specific section
#-----------------------------------------------------------------------------
-# NT test new: enable elbeem compilation be default
-use_fluidsim = 'true'
-
#-----------------------------------------------------------------------------
# User configurable options to be saved in a config file.
#-----------------------------------------------------------------------------