From 2ecf987dc665eff477fb03a0cef0b2972e4b78d2 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Wed, 22 Oct 2008 11:28:10 +0000 Subject: * Minor cleanup of SCons files - cleanup of boolean usage - use True and False now instead of 'true'/'false' or 0/1 - changed SConscripts accordingly --- source/blender/SConscript | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/SConscript') diff --git a/source/blender/SConscript b/source/blender/SConscript index 25745c0e51a..decbbf35642 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -18,17 +18,17 @@ SConscript(['avi/SConscript', 'src/SConscript', 'nodes/SConscript']) -if env['WITH_BF_YAFRAY'] == 1: +if env['WITH_BF_YAFRAY']: SConscript(['yafray/SConscript']) -if env['WITH_BF_INTERNATIONAL'] == 1: +if env['WITH_BF_INTERNATIONAL']: SConscript (['ftfont/SConscript']) -if env['WITH_BF_DDS'] == 1: +if env['WITH_BF_DDS']: SConscript (['imbuf/intern/dds/SConscript']) -if env['WITH_BF_OPENEXR'] == 1: +if env['WITH_BF_OPENEXR']: SConscript (['imbuf/intern/openexr/SConscript']) -if env['WITH_BF_QUICKTIME'] == 1: +if env['WITH_BF_QUICKTIME']: SConscript (['quicktime/SConscript']) -- cgit v1.2.3 From ac4ff83ca6b5795f4451a7e743d3975aeb17ae3b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 28 Oct 2008 18:47:13 +0000 Subject: added scons option BF_WITH_PYTHON (defined as DISABLE_PYTHON) --- source/blender/SConscript | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/SConscript') diff --git a/source/blender/SConscript b/source/blender/SConscript index decbbf35642..543a0bf5ed6 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -11,13 +11,17 @@ SConscript(['avi/SConscript', 'imbuf/SConscript', 'imbuf/intern/cineon/SConscript', 'makesdna/SConscript', - 'python/SConscript', 'radiosity/SConscript', 'readblenfile/SConscript', 'render/SConscript', 'src/SConscript', 'nodes/SConscript']) + + +if env['WITH_BF_PYTHON']: + SConscript(['python/SConscript']) + if env['WITH_BF_YAFRAY']: SConscript(['yafray/SConscript']) -- cgit v1.2.3