From 2ecf987dc665eff477fb03a0cef0b2972e4b78d2 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
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/SConscript                       |  2 +-
 source/blender/SConscript               | 10 +++++-----
 source/blender/blenkernel/SConscript    | 10 +++++-----
 source/blender/blenlib/SConscript       |  2 +-
 source/blender/blenpluginapi/SConscript |  2 +-
 source/blender/imbuf/SConscript         | 12 ++++++------
 source/blender/nodes/SConscript         |  6 +++---
 source/blender/python/SConscript        |  8 ++++----
 source/blender/render/SConscript        |  6 +++---
 source/blender/src/SConscript           | 28 ++++++++++++++--------------
 source/creator/SConscript               |  6 +++---
 11 files changed, 46 insertions(+), 46 deletions(-)

(limited to 'source')

diff --git a/source/SConscript b/source/SConscript
index ca264579f6e..9b497edd85a 100644
--- a/source/SConscript
+++ b/source/SConscript
@@ -4,7 +4,7 @@ Import ('env')
 SConscript(['blender/SConscript',
 			'kernel/SConscript',
 			'creator/SConscript'])
-if env['WITH_BF_GAMEENGINE'] == 1:
+if env['WITH_BF_GAMEENGINE']:
 	SConscript (['gameengine/SConscript'])
 	
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
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'])
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index f891b307b2c..82743ef5ea7 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -29,21 +29,21 @@ if env['WITH_BF_VERSE']:
 if env['WITH_BF_VERSE']:
 	defs += ' WITH_VERSE'
 	
-if env['WITH_BF_OPENEXR'] == 1:
+if env['WITH_BF_OPENEXR']:
     defs += ' WITH_OPENEXR'
 
-if env['WITH_BF_DDS'] == 1:
+if env['WITH_BF_DDS']:
     defs += ' WITH_DDS'
 
-if env['WITH_BF_FFMPEG'] == 1:
+if env['WITH_BF_FFMPEG']:
     defs += ' WITH_FFMPEG'
     incs += ' ' + env['BF_FFMPEG_INC']
 
-if env['WITH_BF_QUICKTIME'] == 1:
+if env['WITH_BF_QUICKTIME']:
     defs += ' WITH_QUICKTIME'
     incs += ' ' + env['BF_QUICKTIME_INC']
 
-if env['BF_NO_ELBEEM'] == 1:
+if env['BF_NO_ELBEEM']:
     defs += ' DISABLE_ELBEEM'
 
 if env['WITH_BF_PLAYER']:
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index 65cebf02f62..e7a4f2eaf13 100644
--- a/source/blender/blenlib/SConscript
+++ b/source/blender/blenlib/SConscript
@@ -10,7 +10,7 @@ incs += ' ' + env['BF_ZLIB_INC']
 incs += ' ' + env['BF_SDL_INC']
 defs = ''
 
-if env['WITH_BF_INTERNATIONAL'] == 1:
+if env['WITH_BF_INTERNATIONAL']:
     defs = 'WITH_FREETYPE2'
 
 if env['WITH_BF_VERSE']:
diff --git a/source/blender/blenpluginapi/SConscript b/source/blender/blenpluginapi/SConscript
index d17a35e933e..4cf52a50e8c 100644
--- a/source/blender/blenpluginapi/SConscript
+++ b/source/blender/blenpluginapi/SConscript
@@ -7,7 +7,7 @@ incs = '. .. #/intern/guardedalloc ../blenlib ../imbuf ../makesdna'
 
 defs = []
 
-if env['WITH_BF_QUICKTIME'] == 1:
+if env['WITH_BF_QUICKTIME']:
 	defs.append('WITH_QUICKTIME')
 	incs += ' ' + env['BF_QUICKTIME_INC']
 
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index 7349f481731..4eba4a843b2 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -17,25 +17,25 @@ if env['WITH_BF_VERSE']:
 	defs.append('WITH_VERSE')
 	incs += ' ' + env['BF_VERSE_INCLUDE']
 	
-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_FFMPEG'] == 1:
+if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
     incs += ' ' + env['BF_FFMPEG_INC']
 
-if env['WITH_BF_OPENJPEG'] == 1:
+if env['WITH_BF_OPENJPEG']:
     defs.append('WITH_OPENJPEG')
     incs += ' ' + env['BF_OPENJPEG_INC']
 
-if env['WITH_BF_REDCODE'] == 1:
+if env['WITH_BF_REDCODE']:
     defs.append('WITH_REDCODE')
     incs += ' ' + env['BF_REDCODE_INC']
 
-if env['WITH_BF_QUICKTIME']==1:
+if env['WITH_BF_QUICKTIME']:
 	incs += ' ' + env['BF_QUICKTIME_INC']
 	defs.append('WITH_QUICKTIME')
 
diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript
index 8af7b67520e..f80f4b521db 100644
--- a/source/blender/nodes/SConscript
+++ b/source/blender/nodes/SConscript
@@ -31,14 +31,14 @@ if env['WITH_BF_VERSE']:
 if env['WITH_BF_VERSE']:
     defs += ' WITH_VERSE'
 
-if env['WITH_BF_OPENEXR'] == 1:
+if env['WITH_BF_OPENEXR']:
     defs += ' WITH_OPENEXR'
 
-if env['WITH_BF_FFMPEG'] == 1:
+if env['WITH_BF_FFMPEG']:
     defs += ' WITH_FFMPEG'
     incs += ' ' + env['BF_FFMPEG_INC']
 
-if env['WITH_BF_QUICKTIME'] == 1:
+if env['WITH_BF_QUICKTIME']:
     defs += ' WITH_QUICKTIME'
     incs += ' ' + env['BF_QUICKTIME_INC']
 
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index 1f0cbd2c86d..670041a6504 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -14,17 +14,17 @@ defs = []
 if env['OURPLATFORM'] in ('win32-mingw') and env['BF_DEBUG']:
 	defs.append('Py_TRACE_REFS')
 
-if env['WITH_BF_QUICKTIME']==1:
+if env['WITH_BF_QUICKTIME']:
 	incs += ' ' + env['BF_QUICKTIME_INC']
 	defs.append('WITH_QUICKTIME')
 	
-if env['WITH_BF_OPENEXR'] == 1:
+if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
 
-if env['WITH_BF_FFMPEG'] == 1:
+if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
 
-if env['BF_BUILDINFO'] == 1:
+if env['BF_BUILDINFO']:
     defs.append('NAN_BUILDINFO')
 
 env.BlenderLib ( libname='blender_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype=['core','game2'], priority = [60,115] )
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index f0d1353b0d3..607ddf5c7a3 100644
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -10,16 +10,16 @@ incs += ' ../quicktime ../include ../../kernel/gen_messaging ../blenloader'
 
 defs = []
 
-if env['WITH_BF_YAFRAY'] == 1:
+if env['WITH_BF_YAFRAY']:
     incs += ' ../yafray'
 else:
     defs.append('DISABLE_YAFRAY')
 
-if env['WITH_BF_QUICKTIME'] == 1:
+if env['WITH_BF_QUICKTIME']:
     defs.append('WITH_QUICKTIME')
     incs += ' ' + env['BF_QUICKTIME_INC']
 
-if env['WITH_BF_FFMPEG'] == 1:
+if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
 
 if env['WITH_BF_OPENEXR']:
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:
diff --git a/source/creator/SConscript b/source/creator/SConscript
index 15f73040f4b..c5a661abd69 100644
--- a/source/creator/SConscript
+++ b/source/creator/SConscript
@@ -11,15 +11,15 @@ incs += ' ../kernel/gen_system #/extern/glew/include ../blender/gpu'
 incs += ' ' + env['BF_OPENGL_INC']
 
 defs = []
-if env['WITH_BF_QUICKTIME']==1:
+if env['WITH_BF_QUICKTIME']:
     incs += ' ' + env['BF_QUICKTIME_INC']
     defs.append('WITH_QUICKTIME')
 
-if env['WITH_BF_BINRELOC']==1:
+if env['WITH_BF_BINRELOC']:
     incs += ' ../../extern/binreloc/include'
     defs.append('WITH_BINRELOC')
 
-if env['WITH_BF_OPENEXR']==1:
+if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
 
 if not env['WITH_BF_SDL']:
-- 
cgit v1.2.3