diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-10-22 15:28:10 +0400 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-10-22 15:28:10 +0400 |
commit | 2ecf987dc665eff477fb03a0cef0b2972e4b78d2 (patch) | |
tree | b0f1e3803bc72dea7bbbbd42f684023ee6c8cfde /source/blender/src | |
parent | 688cc11302caa8cde5649e6230c66a1c60cd24a2 (diff) |
* Minor cleanup of SCons files
- cleanup of boolean usage - use True and False now instead of 'true'/'false' or 0/1
- changed SConscripts accordingly
Diffstat (limited to 'source/blender/src')
-rw-r--r-- | source/blender/src/SConscript | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript index 5365908c130..47b269c85d7 100644 --- a/source/blender/src/SConscript +++ b/source/blender/src/SConscript @@ -5,7 +5,7 @@ Import ('env') sources = env.Glob('*.c') -if env['BF_SPLIT_SRC'] == 1: +if env['BF_SPLIT_SRC']: numobj = len(sources) maxobj = 30 @@ -36,36 +36,36 @@ incs += ' ' + env['BF_OPENGL_INC'] defs = [] -if env['BF_TWEAK_MODE'] == 1: +if env['BF_TWEAK_MODE']: defs.append('TWEAK_MODE') -if env['WITH_BF_YAFRAY'] == 0: +if not env['WITH_BF_YAFRAY']: defs.append('DISABLE_YAFRAY') -if env['WITH_BF_INTERNATIONAL'] == 1: +if env['WITH_BF_INTERNATIONAL']: incs += ' ../ftfont' defs.append('INTERNATIONAL') defs.append('FTGL_STATIC_LIBRARY') -if env['WITH_BF_OPENEXR'] == 1: +if env['WITH_BF_OPENEXR']: defs.append('WITH_OPENEXR') -if env['WITH_BF_DDS'] == 1: +if env['WITH_BF_DDS']: defs.append('WITH_DDS') -if env['WITH_BF_QUICKTIME']==1: +if env['WITH_BF_QUICKTIME']: incs += ' ' + env['BF_QUICKTIME_INC'] defs.append('WITH_QUICKTIME') -if env['WITH_BF_ICONV'] == 1: +if env['WITH_BF_ICONV']: incs += ' ' + env['BF_ICONV_INC'] defs.append('WITH_ICONV') -if env['WITH_BF_FFMPEG'] == 1: +if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') incs += ' ' + env['BF_FFMPEG_INC'] -if env['WITH_BF_OGG'] == 1: +if env['WITH_BF_OGG']: defs.append('WITH_OGG') if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): @@ -76,16 +76,16 @@ if env['WITH_BF_VERSE']: incs += ' ' + env['BF_VERSE_INCLUDE'] # TODO buildinfo -if env['BF_BUILDINFO'] == 1: +if env['BF_BUILDINFO']: defs.append('NAN_BUILDINFO') -if env['BF_NO_ELBEEM'] == 1: +if env['BF_NO_ELBEEM']: defs.append('DISABLE_ELBEEM') -if env['WITH_BF_SDL'] == 0: +if not env['WITH_BF_SDL']: defs.append('DISABLE_SDL') -if (env['BF_SPLIT_SRC'] == 1) and (env['OURPLATFORM'] == 'win32-mingw'): +if env['BF_SPLIT_SRC'] and (env['OURPLATFORM'] == 'win32-mingw'): for i in range(numlibs): env.BlenderLib ( libname = 'src%d' % (i), sources = subsources[i], includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [5, 25] ) else: |