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 --- config/darwin-config.py | 64 ++++++++++++------------ config/linux2-config.py | 64 ++++++++++++------------ config/linuxcross-config.py | 44 ++++++++-------- config/openbsd3-config.py | 48 +++++++++--------- config/sunos5-config.py | 52 +++++++++---------- config/win32-mingw-config.py | 48 +++++++++--------- config/win32-vc-config.py | 53 ++++++++++---------- extern/bFTGL/SConscript | 18 ------- intern/SConscript | 2 +- intern/elbeem/SConscript | 2 +- 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 +-- tools/Blender.py | 4 +- tools/btools.py | 89 +++++++++++++++++---------------- 23 files changed, 282 insertions(+), 298 deletions(-) diff --git a/config/darwin-config.py b/config/darwin-config.py index cc6c6ef76af..ccc3eb5a0d0 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -8,7 +8,7 @@ import commands # IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs -USE_SDK='true' +USE_SDK=True BF_PYTHON_VERSION = '2.3' @@ -38,15 +38,15 @@ else: # enable ffmpeg support -WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG +WITH_BF_FFMPEG = True # -DWITH_FFMPEG BF_FFMPEG = "#extern/ffmpeg" BF_FFMPEG_INC = '${BF_FFMPEG}/include' -if USE_SDK=='true': +if USE_SDK==True: BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS #BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' #BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a' -WITH_BF_VERSE = 'false' +WITH_BF_VERSE = False BF_VERSE = "#extern/verse/dist" BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist" BF_VERSE_INCLUDE = BF_VERSE @@ -76,9 +76,9 @@ WITH_BF_OPENMP = '0' # Note : should be true, but openal simply dont work on intel if MAC_PROC == 'i386': - WITH_BF_OPENAL = 'false' + WITH_BF_OPENAL = False else: - WITH_BF_OPENAL = 'true' + WITH_BF_OPENAL = True #different lib must be used following version of gcc # for gcc 3.3 #BF_OPENAL = LIBDIR + '/openal' @@ -88,7 +88,7 @@ if MAC_PROC == 'powerpc': else : BF_OPENAL = LIBDIR + '/openal' -WITH_BF_STATICOPENAL = 'false' +WITH_BF_STATICOPENAL = False BF_OPENAL_INC = '${BF_OPENAL}/include' BF_OPENAL_LIB = 'openal' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' @@ -97,20 +97,20 @@ BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' # Warning, this static lib configuration is untested! users of this OS please confirm. BF_CXX = '/usr' -WITH_BF_STATICCXX = 'false' +WITH_BF_STATICCXX = False BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' -WITH_BF_SDL = 'true' +WITH_BF_SDL = True BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix) BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags) BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer BF_SDL_LIBPATH = '${BF_SDL}/lib' -WITH_BF_FMOD = 'false' +WITH_BF_FMOD = False BF_FMOD = LIBDIR + '/fmod' -WITH_BF_OPENEXR = 'true' -WITH_BF_STATICOPENEXR = 'false' +WITH_BF_OPENEXR = True +WITH_BF_STATICOPENEXR = False BF_OPENEXR = '${LCGDIR}/openexr' BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR' BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread' @@ -118,15 +118,15 @@ BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' # Warning, this static lib configuration is untested! users of this OS please confirm. BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' -WITH_BF_DDS = 'true' +WITH_BF_DDS = True -WITH_BF_JPEG = 'true' +WITH_BF_JPEG = True BF_JPEG = LIBDIR + '/jpeg' BF_JPEG_INC = '${BF_JPEG}/include' BF_JPEG_LIB = 'jpeg' BF_JPEG_LIBPATH = '${BF_JPEG}/lib' -WITH_BF_PNG = 'true' +WITH_BF_PNG = True BF_PNG = LIBDIR + '/png' BF_PNG_INC = '${BF_PNG}/include' BF_PNG_LIB = 'png' @@ -135,32 +135,32 @@ BF_PNG_LIBPATH = '${BF_PNG}/lib' BF_TIFF = LIBDIR + '/tiff' BF_TIFF_INC = '${BF_TIFF}/include' -WITH_BF_ZLIB = 'true' +WITH_BF_ZLIB = True BF_ZLIB = '/usr' BF_ZLIB_INC = '${BF_ZLIB}/include' BF_ZLIB_LIB = 'z' -WITH_BF_INTERNATIONAL = 'true' +WITH_BF_INTERNATIONAL = True BF_GETTEXT = LIBDIR + '/gettext' BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'intl' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = 'true' +WITH_BF_FTGL = True BF_FTGL = '#extern/bFTGL' BF_FTGL_INC = '${BF_FTGL}/include' BF_FTGL_LIB = 'extern_ftgl' -WITH_BF_GAMEENGINE='true' -WITH_BF_PLAYER='true' +WITH_BF_GAMEENGINE=True +WITH_BF_PLAYER=True -WITH_BF_ODE = 'false' +WITH_BF_ODE = False BF_ODE = LIBDIR + '/ode' BF_ODE_INC = '${BF_ODE}/include' BF_ODE_LIB = '${BF_ODE}/lib/libode.a' -WITH_BF_BULLET = 'true' +WITH_BF_BULLET = True BF_BULLET = '#extern/bullet2/src' BF_BULLET_INC = '${BF_BULLET}' BF_BULLET_LIB = 'extern_bullet' @@ -169,9 +169,9 @@ BF_SOLID = '#extern/solid' BF_SOLID_INC = '${BF_SOLID}' BF_SOLID_LIB = 'extern_solid' -WITH_BF_YAFRAY = 'true' +WITH_BF_YAFRAY = True -#WITH_BF_NSPR = 'true' +#WITH_BF_NSPR = True #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr #BF_NSPR_LIB = @@ -186,7 +186,7 @@ WITH_BF_YAFRAY = 'true' # if this is not set. # # Be paranoid regarding library creation (do not update archives) -#BF_PARANOID = 'true' +#BF_PARANOID = True # enable freetype2 support for text objects BF_FREETYPE = LIBDIR + '/freetype' @@ -194,16 +194,16 @@ BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIB = 'freetype' BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' -WITH_BF_QUICKTIME = 'true' # -DWITH_QUICKTIME +WITH_BF_QUICKTIME = True # -DWITH_QUICKTIME -WITH_BF_ICONV = 'true' +WITH_BF_ICONV = True BF_ICONV = LIBDIR + "/iconv" BF_ICONV_INC = '${BF_ICONV}/include' BF_ICONV_LIB = 'iconv' #BF_ICONV_LIBPATH = '${BF_ICONV}/lib' # Mesa Libs should go here if your using them as well.... -WITH_BF_STATICOPENGL = 'true' +WITH_BF_STATICOPENGL = True BF_OPENGL_LIB = 'GL GLU' BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries' BF_OPENGL_LINKFLAGS = '-framework OpenGL' @@ -225,7 +225,7 @@ if MAC_MIN_VERS == '10.3': PLATFORM_LINKFLAGS = '-fuse-cxa-atexit '+PLATFORM_LINKFLAGS LLIBS = LLIBS + ' crt3.o' -if USE_SDK=='true': +if USE_SDK==True: SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS] PLATFORM_LINKFLAGS = '-mmacosx-version-min='+MAC_MIN_VERS+ ' -Wl,-syslibroot,' + MACOSX_SDK+" "+PLATFORM_LINKFLAGS CCFLAGS=SDK_FLAGS+CCFLAGS @@ -243,7 +243,7 @@ else: REL_CFLAGS = ['-O2'] REL_CCFLAGS = ['-O2'] -##BF_DEPEND = 'true' +##BF_DEPEND = True ## ##AR = ar ##ARFLAGS = ruv @@ -261,9 +261,9 @@ CC_WARN = ' -Wall -Wno-long-double' ##DYNLDFLAGS = -shared $(LDFLAGS) BF_PROFILE_FLAGS = ' -pg -g ' -BF_PROFILE = 'false' +BF_PROFILE = False -BF_DEBUG = 'false' +BF_DEBUG = False BF_DEBUG_FLAGS = '-g' BF_BUILDDIR='../build/darwin' diff --git a/config/linux2-config.py b/config/linux2-config.py index 74853de70b6..1e3110cd1db 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -1,20 +1,20 @@ LCGDIR = '../lib/linux2' LIBDIR = "${LCGDIR}" -WITH_BF_VERSE = 'false' +WITH_BF_VERSE = False BF_VERSE_INCLUDE = "#extern/verse/dist" BF_PYTHON = '/usr' BF_PYTHON_VERSION = '2.5' -WITH_BF_STATICPYTHON = 'false' +WITH_BF_STATICPYTHON = False BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a' BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic'] BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}.a' -WITH_BF_OPENAL = 'true' -WITH_BF_STATICOPENAL = 'false' +WITH_BF_OPENAL = True +WITH_BF_STATICOPENAL = False BF_OPENAL = '/usr' BF_OPENAL_INC = '${BF_OPENAL}/include' BF_OPENAL_LIB = 'openal' @@ -26,19 +26,19 @@ BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' # BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a ${BF_OPENAL}/lib/libalut.a' BF_CXX = '/usr' -WITH_BF_STATICCXX = 'false' +WITH_BF_STATICCXX = False BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' -WITH_BF_SDL = 'true' +WITH_BF_SDL = True BF_SDL = '/usr' #$(shell sdl-config --prefix) BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags) BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer -WITH_BF_FMOD = 'false' +WITH_BF_FMOD = False BF_FMOD = LIBDIR + '/fmod' -WITH_BF_OPENEXR = 'true' -WITH_BF_STATICOPENEXR = 'false' +WITH_BF_OPENEXR = True +WITH_BF_STATICOPENEXR = False BF_OPENEXR = '/usr' # when compiling with your own openexr lib you might need to set... # BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include' @@ -49,14 +49,14 @@ BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf # BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' -WITH_BF_DDS = 'true' +WITH_BF_DDS = True -WITH_BF_JPEG = 'true' +WITH_BF_JPEG = True BF_JPEG = '/usr' BF_JPEG_INC = '${BF_JPEG}/include' BF_JPEG_LIB = 'jpeg' -WITH_BF_PNG = 'true' +WITH_BF_PNG = True BF_PNG = '/usr' BF_PNG_INC = '${BF_PNG}/include' BF_PNG_LIB = 'png' @@ -64,31 +64,31 @@ BF_PNG_LIB = 'png' BF_TIFF = '/usr' BF_TIFF_INC = '${BF_TIFF}/include' -WITH_BF_ZLIB = 'true' +WITH_BF_ZLIB = True BF_ZLIB = '/usr' BF_ZLIB_INC = '${BF_ZLIB}/include' BF_ZLIB_LIB = 'z' -WITH_BF_INTERNATIONAL = 'true' +WITH_BF_INTERNATIONAL = True BF_GETTEXT = '/usr' BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gettextlib' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = 'true' +WITH_BF_FTGL = True BF_FTGL = '#extern/bFTGL' BF_FTGL_INC = '${BF_FTGL}/include' BF_FTGL_LIB = 'extern_ftgl' -WITH_BF_GAMEENGINE='false' +WITH_BF_GAMEENGINE=False -WITH_BF_ODE = 'false' +WITH_BF_ODE = False BF_ODE = LIBDIR + '/ode' BF_ODE_INC = BF_ODE + '/include' BF_ODE_LIB = BF_ODE + '/lib/libode.a' -WITH_BF_BULLET = 'true' +WITH_BF_BULLET = True BF_BULLET = '#extern/bullet2/src' BF_BULLET_INC = '${BF_BULLET}' BF_BULLET_LIB = 'extern_bullet' @@ -97,9 +97,9 @@ BF_SOLID = '#extern/solid' BF_SOLID_INC = '${BF_SOLID}' BF_SOLID_LIB = 'extern_solid' -WITH_BF_YAFRAY = 'true' +WITH_BF_YAFRAY = True -#WITH_BF_NSPR = 'true' +#WITH_BF_NSPR = True #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr #BF_NSPR_LIB = @@ -114,27 +114,27 @@ WITH_BF_YAFRAY = 'true' # if this is not set. # # Be paranoid regarding library creation (do not update archives) -#BF_PARANOID = 'true' +#BF_PARANOID = True # enable freetype2 support for text objects BF_FREETYPE = '/usr' BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIB = 'freetype' -WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME +WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME BF_QUICKTIME = '/usr/local' BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' -WITH_BF_ICONV = 'false' +WITH_BF_ICONV = False BF_ICONV = LIBDIR + "/iconv" BF_ICONV_INC = '${BF_ICONV}/include' BF_ICONV_LIB = 'iconv' BF_ICONV_LIBPATH = '${BF_ICONV}/lib' -WITH_BF_BINRELOC = 'true' +WITH_BF_BINRELOC = True # enable ffmpeg support -WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG +WITH_BF_FFMPEG = True # -DWITH_FFMPEG BF_FFMPEG = '#extern/ffmpeg' BF_FFMPEG_LIB = '' # Uncomment the following two lines to use system's ffmpeg @@ -144,25 +144,25 @@ BF_FFMPEG_INC = '${BF_FFMPEG}/include' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' # enable ogg, vorbis and theora in ffmpeg -WITH_BF_OGG = 'false' # -DWITH_OGG +WITH_BF_OGG = False # -DWITH_OGG BF_OGG = '/usr' BF_OGG_INC = '${BF_OGG}/include' BF_OGG_LIB = 'ogg vorbis theoraenc theoradec' -WITH_BF_OPENJPEG = 'true' +WITH_BF_OPENJPEG = True BF_OPENJPEG = '#extern/libopenjpeg' BF_OPENJPEG_LIB = '' BF_OPENJPEG_INC = '${BF_OPENJPEG}/include' BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib' -WITH_BF_REDCODE = 'false' +WITH_BF_REDCODE = False BF_REDCODE = '#extern/libredcode' BF_REDCODE_LIB = '' BF_REDCODE_INC = '${BF_REDCODE}/include' BF_REDCODE_LIBPATH='${BF_REDCODE}/lib' # Mesa Libs should go here if your using them as well.... -WITH_BF_STATICOPENGL = 'false' +WITH_BF_STATICOPENGL = False BF_OPENGL = '/usr' BF_OPENGL_INC = '${BF_OPENGL}/include' BF_OPENGL_LIB = 'GL GLU X11 Xi' @@ -181,7 +181,7 @@ CPPFLAGS = ['-DXP_UNIX'] CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] REL_CFLAGS = ['-O2'] REL_CCFLAGS = ['-O2'] -##BF_DEPEND = 'true' +##BF_DEPEND = True ## ##AR = ar ##ARFLAGS = ruv @@ -198,9 +198,9 @@ LLIBS = 'util c m dl pthread stdc++' ##DYNLDFLAGS = -shared $(LDFLAGS) BF_PROFILE_FLAGS = ['-pg','-g'] -BF_PROFILE = 'false' +BF_PROFILE = False -BF_DEBUG = 'false' +BF_DEBUG = False BF_DEBUG_FLAGS = '-g' BF_BUILDDIR = '../build/linux2' diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py index 13f477d21f3..c10e9d76cb5 100644 --- a/config/linuxcross-config.py +++ b/config/linuxcross-config.py @@ -1,10 +1,10 @@ LCGDIR = '../lib/windows' LIBDIR = '${LCGDIR}' -WITH_BF_VERSE = 'false' +WITH_BF_VERSE = False BF_VERSE_INCLUDE = "#extern/verse/dist" -WITH_BF_YAFRAY = 'true' +WITH_BF_YAFRAY = True BF_PYTHON = LIBDIR + '/python' BF_PYTHON_VERSION = '2.5' @@ -13,8 +13,8 @@ BF_PYTHON_BINARY = 'python' BF_PYTHON_LIB = 'python25' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' -WITH_BF_OPENAL = 'true' -WITH_BF_STATICOPENAL = 'false' +WITH_BF_OPENAL = True +WITH_BF_STATICOPENAL = False BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include' BF_OPENAL_LIB = 'openal_static' @@ -24,10 +24,10 @@ BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' # Warning, this static lib configuration is untested! users of this OS please confirm. BF_CXX = '/usr' -WITH_BF_STATICCXX = 'false' +WITH_BF_STATICCXX = False BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' -WITH_BF_SDL = 'true' +WITH_BF_SDL = True BF_SDL = LIBDIR + '/sdl' BF_SDL_INC = '${BF_SDL}/include' BF_SDL_LIB = 'SDL' @@ -38,11 +38,11 @@ BF_PTHREADS_INC = '${BF_PTHREADS}/include' BF_PTHREADS_LIB = 'pthreadGC2' BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib' -WITH_BF_FMOD = 'false' +WITH_BF_FMOD = False BF_FMOD = LIBDIR + '/fmod' -WITH_BF_OPENEXR = 'true' -WITH_BF_STATICOPENEXR = 'false' +WITH_BF_OPENEXR = True +WITH_BF_STATICOPENEXR = False BF_OPENEXR = LIBDIR + '/gcc/openexr' BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR' BF_OPENEXR_LIB = ' Half IlmImf Iex ' @@ -50,15 +50,15 @@ BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' # Warning, this static lib configuration is untested! users of this OS please confirm. BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' -WITH_BF_DDS = 'true' +WITH_BF_DDS = True -WITH_BF_JPEG = 'true' +WITH_BF_JPEG = True BF_JPEG = LIBDIR + '/jpeg' BF_JPEG_INC = '${BF_JPEG}/include' BF_JPEG_LIB = 'jpeg' BF_JPEG_LIBPATH = '${BF_JPEG}/lib' -WITH_BF_PNG = 'true' +WITH_BF_PNG = True BF_PNG = LIBDIR + '/png' BF_PNG_INC = '${BF_PNG}/include' BF_PNG_LIB = 'png' @@ -67,32 +67,32 @@ BF_PNG_LIBPATH = '${BF_PNG}/lib' BF_TIFF = LIBDIR + '/tiff' BF_TIFF_INC = '${BF_TIFF}/include' -WITH_BF_ZLIB = 'true' +WITH_BF_ZLIB = True BF_ZLIB = LIBDIR + '/zlib' BF_ZLIB_INC = '${BF_ZLIB}/include' #BF_ZLIB_LIB = 'z' BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib' -WITH_BF_INTERNATIONAL = 'true' +WITH_BF_INTERNATIONAL = True BF_GETTEXT = LIBDIR + '/gettext' BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gnu_gettext' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = 'true' +WITH_BF_FTGL = True BF_FTGL = LIBDIR + '/ftgl' BF_FTGL_INC = '${BF_FTGL}/include' BF_FTGL_LIB = 'extern_ftgl' -WITH_BF_GAMEENGINE = 'false' +WITH_BF_GAMEENGINE = False -WITH_BF_ODE = 'true' +WITH_BF_ODE = True BF_ODE = LIBDIR + '/ode' BF_ODE_INC = BF_ODE + '/include' BF_ODE_LIB = BF_ODE + '/lib/libode.a' -WITH_BF_BULLET = 'true' +WITH_BF_BULLET = True BF_BULLET = '#extern/bullet2/src' BF_BULLET_INC = '${BF_BULLET}' BF_BULLET_LIB = 'extern_bullet' @@ -107,18 +107,18 @@ BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIB = 'freetype' BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' -WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME +WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME BF_QUICKTIME = '/usr/local' BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' -WITH_BF_ICONV = 'false' +WITH_BF_ICONV = False BF_ICONV = LIBDIR + "/iconv" BF_ICONV_INC = '${BF_ICONV}/include' BF_ICONV_LIB = 'iconv' BF_ICONV_LIBPATH = '${BF_ICONV}/lib' # Mesa Libs should go here if your using them as well.... -WITH_BF_STATICOPENGL = 'false' +WITH_BF_STATICOPENGL = False BF_OPENGL = 'C:\\MingW' BF_OPENGL_INC = '${BF_OPENGL}/include' BF_OPENGL_LIBINC = '${BF_OPENGL}/lib' @@ -143,7 +143,7 @@ CC_WARN = [ '-Wall' ] LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread' ] -BF_DEBUG = 'false' +BF_DEBUG = False BF_DEBUG_FLAGS= '' BF_BUILDDIR = '../build/linuxcross' diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py index 1cd93008561..b2112c84b98 100644 --- a/config/openbsd3-config.py +++ b/config/openbsd3-config.py @@ -8,40 +8,40 @@ BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config' -WITH_BF_OPENAL = 'false' -# WITH_BF_STATICOPENAL = 'false' +WITH_BF_OPENAL = False +# WITH_BF_STATICOPENAL = False #BF_OPENAL = LIBDIR + '/openal' #BF_OPENAL_INC = '${BF_OPENAL}/include' #BF_OPENAL_LIB = 'openal' #BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' #BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' -WITH_BF_SDL = 'true' +WITH_BF_SDL = True BF_SDL = '/usr/local' #$(shell sdl-config --prefix) BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags) BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer BF_SDL_LIBPATH = '${BF_SDL}/lib' -WITH_BF_FMOD = 'false' +WITH_BF_FMOD = False BF_FMOD = LIBDIR + '/fmod' -WITH_BF_OPENEXR = 'false' -WITH_BF_STATICOPENEXR = 'false' +WITH_BF_OPENEXR = False +WITH_BF_STATICOPENEXR = False BF_OPENEXR = '/usr/local' BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR' BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' # Warning, this static lib configuration is untested! users of this OS please confirm. BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' -WITH_BF_DDS = 'true' +WITH_BF_DDS = True -WITH_BF_JPEG = 'true' +WITH_BF_JPEG = True BF_JPEG = '/usr/local' BF_JPEG_INC = '${BF_JPEG}/include' BF_JPEG_LIB = 'jpeg' BF_JPEG_LIBPATH = '${BF_JPEG}/lib' -WITH_BF_PNG = 'true' +WITH_BF_PNG = True BF_PNG = '/usr/local' BF_PNG_INC = '${BF_PNG}/include/libpng' BF_PNG_LIB = 'png' @@ -50,31 +50,31 @@ BF_PNG_LIBPATH = '${BF_PNG}/lib' BF_TIFF = '/usr/local' BF_TIFF_INC = '${BF_TIFF}/include' -WITH_BF_ZLIB = 'true' +WITH_BF_ZLIB = True BF_ZLIB = '/usr/local' BF_ZLIB_INC = '${BF_ZLIB}/include' BF_ZLIB_LIB = 'z' -WITH_BF_INTERNATIONAL = 'true' +WITH_BF_INTERNATIONAL = True BF_GETTEXT = '/usr/local' BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'intl iconv' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = 'true' +WITH_BF_FTGL = True BF_FTGL = '#extern/bFTGL' BF_FTGL_INC = '${BF_FTGL}/include' BF_FTGL_LIB = 'extern_ftgl' -WITH_BF_GAMEENGINE='false' +WITH_BF_GAMEENGINE=False -WITH_BF_ODE = 'false' +WITH_BF_ODE = False BF_ODE = LIBDIR + '/ode' BF_ODE_INC = '${BF_ODE}/include' BF_ODE_LIB = '${BF_ODE}/lib/libode.a' -WITH_BF_BULLET = 'true' +WITH_BF_BULLET = True BF_BULLET = '#extern/bullet2/src' BF_BULLET_INC = '${BF_BULLET}' BF_BULLET_LIB = 'extern_bullet' @@ -83,9 +83,9 @@ BF_SOLID = '#extern/solid' BF_SOLID_INC = '${BF_SOLID}' BF_SOLID_LIB = 'extern_solid' -WITH_BF_YAFRAY = 'true' +WITH_BF_YAFRAY = True -#WITH_BF_NSPR = 'true' +#WITH_BF_NSPR = True #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr #BF_NSPR_LIB = @@ -100,7 +100,7 @@ WITH_BF_YAFRAY = 'true' # if this is not set. # # Be paranoid regarding library creation (do not update archives) -#BF_PARANOID = 'true' +#BF_PARANOID = True # enable freetype2 support for text objects BF_FREETYPE = '/usr/X11R6' @@ -108,16 +108,16 @@ BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIB = 'freetype' BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' -WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME +WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME -WITH_BF_ICONV = 'false' +WITH_BF_ICONV = False BF_ICONV = LIBDIR + "/iconv" BF_ICONV_INC = '${BF_ICONV}/include' BF_ICONV_LIB = 'iconv' BF_ICONV_LIBPATH = '${BF_ICONV}/lib' # Mesa Libs should go here if your using them as well.... -WITH_BF_STATICOPENGL = 'true' +WITH_BF_STATICOPENGL = True BF_OPENGL = '/usr/X11R6' BF_OPENGL_INC = '${BF_OPENGL}/include' BF_OPENGL_LIB = 'GL GLU X11 Xi' @@ -137,7 +137,7 @@ CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] REL_CFLAGS = ['-O2'] REL_CCFLAGS = ['-O2'] -##BF_DEPEND = 'true' +##BF_DEPEND = True ## ##AR = ar ##ARFLAGS = ruv @@ -156,9 +156,9 @@ LLIBS = 'm stdc++ pthread util' ##DYNLDFLAGS = -shared $(LDFLAGS) BF_PROFILE_FLAGS = ' -pg -g ' -BF_PROFILE = 'false' +BF_PROFILE = False -BF_DEBUG = 'false' +BF_DEBUG = False BF_DEBUG_FLAGS = '-g' BF_BUILDDIR='../build/openbsd3' diff --git a/config/sunos5-config.py b/config/sunos5-config.py index a5ba33e44cd..bb6c5d89e46 100644 --- a/config/sunos5-config.py +++ b/config/sunos5-config.py @@ -8,8 +8,8 @@ BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a' BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic'] -WITH_BF_OPENAL = 'true' -WITH_BF_STATICOPENAL = 'false' +WITH_BF_OPENAL = True +WITH_BF_STATICOPENAL = False BF_OPENAL = '/usr/local' BF_OPENAL_INC = '${BF_OPENAL}/include' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' @@ -19,20 +19,20 @@ BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' # Warning, this static lib configuration is untested! users of this OS please confirm. BF_CXX = '/usr' -WITH_BF_STATICCXX = 'false' +WITH_BF_STATICCXX = False BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' -WITH_BF_SDL = 'true' +WITH_BF_SDL = True BF_SDL = '/usr/local' #$(shell sdl-config --prefix) BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags) BF_SDL_LIBPATH = '${BF_SDL}/lib' BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer -WITH_BF_FMOD = 'false' +WITH_BF_FMOD = False BF_FMOD = LIBDIR + '/fmod' -WITH_BF_OPENEXR = 'true' -WITH_BF_STATICOPENEXR = 'false' +WITH_BF_OPENEXR = True +WITH_BF_STATICOPENEXR = False BF_OPENEXR = '/usr/local' BF_OPENEXR_INC = ['${BF_OPENEXR}/include', '${BF_OPENEXR}/include/OpenEXR' ] BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' @@ -40,15 +40,15 @@ BF_OPENEXR_LIB = 'Half IlmImf Iex Imath ' # Warning, this static lib configuration is untested! users of this OS please confirm. BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' -WITH_BF_DDS = 'true' +WITH_BF_DDS = True -WITH_BF_JPEG = 'true' +WITH_BF_JPEG = True BF_JPEG = '/usr/local' BF_JPEG_INC = '${BF_JPEG}/include' BF_JPEG_LIBPATH = '${BF_JPEG}/lib' BF_JPEG_LIB = 'jpeg' -WITH_BF_PNG = 'true' +WITH_BF_PNG = True BF_PNG = '/usr/local' BF_PNG_INC = '${BF_PNG}/include' BF_PNG_LIBPATH = '${BF_PNG}/lib' @@ -57,32 +57,32 @@ BF_PNG_LIB = 'png' BF_TIFF = '/usr/local' BF_TIFF_INC = '${BF_TIFF}/include' -WITH_BF_ZLIB = 'true' +WITH_BF_ZLIB = True BF_ZLIB = '/usr' BF_ZLIB_INC = '${BF_ZLIB}/include' BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib' BF_ZLIB_LIB = 'z' -WITH_BF_INTERNATIONAL = 'true' +WITH_BF_INTERNATIONAL = True BF_GETTEXT = '/usr/local' BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gettextlib' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = 'true' +WITH_BF_FTGL = True BF_FTGL = '#extern/bFTGL' BF_FTGL_INC = '${BF_FTGL}/include' BF_FTGL_LIB = 'extern_ftgl' -WITH_BF_GAMEENGINE='false' +WITH_BF_GAMEENGINE=False -WITH_BF_ODE = 'false' +WITH_BF_ODE = False BF_ODE = LIBDIR + '/ode' BF_ODE_INC = BF_ODE + '/include' BF_ODE_LIB = BF_ODE + '/lib/libode.a' -WITH_BF_BULLET = 'true' +WITH_BF_BULLET = True BF_BULLET = '#extern/bullet2/src' BF_BULLET_INC = '${BF_BULLET}' BF_BULLET_LIB = 'extern_bullet' @@ -91,9 +91,9 @@ BF_SOLID = '#extern/solid' BF_SOLID_INC = '${BF_SOLID}' BF_SOLID_LIB = 'extern_solid' -WITH_BF_YAFRAY = 'true' +WITH_BF_YAFRAY = True -#WITH_BF_NSPR = 'true' +#WITH_BF_NSPR = True #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr #BF_NSPR_LIB = @@ -108,7 +108,7 @@ WITH_BF_YAFRAY = 'true' # if this is not set. # # Be paranoid regarding library creation (do not update archives) -#BF_PARANOID = 'true' +#BF_PARANOID = True # enable freetype2 support for text objects BF_FREETYPE = '/usr/local' @@ -116,25 +116,25 @@ BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' BF_FREETYPE_LIB = 'freetype' -WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME +WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME BF_QUICKTIME = '/usr/local' BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' -WITH_BF_ICONV = 'true' +WITH_BF_ICONV = True BF_ICONV = "/usr" BF_ICONV_INC = '${BF_ICONV}/include' BF_ICONV_LIB = 'iconv' BF_ICONV_LIBPATH = '${BF_ICONV}/lib' # enable ffmpeg support -WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG +WITH_BF_FFMPEG = False # -DWITH_FFMPEG BF_FFMPEG = '/usr/local' BF_FFMPEG_INC = '${BF_FFMPEG}/include' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' BF_FFMPEG_LIB = 'avformat avcodec avutil' # Mesa Libs should go here if your using them as well.... -WITH_BF_STATICOPENGL = 'false' +WITH_BF_STATICOPENGL = False BF_OPENGL = '/usr/openwin' BF_OPENGL_INC = '${BF_OPENGL}/include' BF_OPENGL_LIB = 'GL GLU X11 Xi' @@ -153,7 +153,7 @@ CPPFLAGS = ['-DXP_UNIX', '-DSUN_OGL_NO_VERTEX_MACROS'] CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing'] REL_CFLAGS = ['-O2'] REL_CCFLAGS = ['-O2'] -##BF_DEPEND = 'true' +##BF_DEPEND = True ## ##AR = ar ##ARFLAGS = ruv @@ -170,9 +170,9 @@ LLIBS = 'c m dl pthread stdc++' ##DYNLDFLAGS = -shared $(LDFLAGS) BF_PROFILE_FLAGS = ['-pg','-g'] -BF_PROFILE = 'false' +BF_PROFILE = False -BF_DEBUG = 'false' +BF_DEBUG = False BF_DEBUG_FLAGS = '' BF_BUILDDIR = '../build/sunos5' diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 65b7beb79ad..d7ecad33bca 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -1,7 +1,7 @@ LCGDIR = '#../lib/windows' LIBDIR = "${LCGDIR}" -WITH_BF_VERSE = 'false' +WITH_BF_VERSE = False BF_VERSE_INCLUDE = "#extern/verse/dist" BF_PYTHON = LIBDIR + '/python' @@ -11,8 +11,8 @@ BF_PYTHON_BINARY = 'python' BF_PYTHON_LIB = 'python25' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' -WITH_BF_OPENAL = 'true' -WITH_BF_STATICOPENAL = 'false' +WITH_BF_OPENAL = True +WITH_BF_STATICOPENAL = False BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include' BF_OPENAL_LIB = 'dxguid openal_static' @@ -20,12 +20,12 @@ BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' # Warning, this static lib configuration is untested! users of this OS please confirm. BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' -WITH_BF_FFMPEG = 'false' +WITH_BF_FFMPEG = False BF_FFMPEG_LIB = 'avformat swscale avcodec avutil xvidcore x264' BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib' BF_FFMPEG_INC = LIBDIR + '/gcc/ffmpeg/include' -WITH_BF_SDL = 'true' +WITH_BF_SDL = True BF_SDL = LIBDIR + '/sdl' BF_SDL_INC = '${BF_SDL}/include' BF_SDL_LIB = 'SDL' @@ -36,11 +36,11 @@ BF_PTHREADS_INC = '${BF_PTHREADS}/include' BF_PTHREADS_LIB = 'pthreadGC2' BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib' -WITH_BF_FMOD = 'false' +WITH_BF_FMOD = False BF_FMOD = LIBDIR + '/fmod' -WITH_BF_OPENEXR = 'true' -WITH_BF_STATICOPENEXR = 'false' +WITH_BF_OPENEXR = True +WITH_BF_STATICOPENEXR = False BF_OPENEXR = LIBDIR + '/gcc/openexr' BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR' BF_OPENEXR_LIB = ' Half IlmImf Iex ' @@ -48,15 +48,15 @@ BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib' # Warning, this static lib configuration is untested! users of this OS please confirm. BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' -WITH_BF_DDS = 'true' +WITH_BF_DDS = True -WITH_BF_JPEG = 'true' +WITH_BF_JPEG = True BF_JPEG = LIBDIR + '/jpeg' BF_JPEG_INC = '${BF_JPEG}/include' BF_JPEG_LIB = 'jpeg' BF_JPEG_LIBPATH = '${BF_JPEG}/lib' -WITH_BF_PNG = 'true' +WITH_BF_PNG = True BF_PNG = LIBDIR + '/png' BF_PNG_INC = '${BF_PNG}/include' BF_PNG_LIB = 'png' @@ -65,31 +65,31 @@ BF_PNG_LIBPATH = '${BF_PNG}/lib' BF_TIFF = LIBDIR + '/tiff' BF_TIFF_INC = '${BF_TIFF}/include' -WITH_BF_ZLIB = 'true' +WITH_BF_ZLIB = True BF_ZLIB = LIBDIR + '/zlib' BF_ZLIB_INC = '${BF_ZLIB}/include' BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib' -WITH_BF_INTERNATIONAL = 'true' +WITH_BF_INTERNATIONAL = True BF_GETTEXT = LIBDIR + '/gettext' BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gnu_gettext' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = 'true' +WITH_BF_FTGL = True BF_FTGL = LIBDIR + '/ftgl' BF_FTGL_INC = '${BF_FTGL}/include' BF_FTGL_LIB = 'extern_ftgl' -WITH_BF_GAMEENGINE = 'false' +WITH_BF_GAMEENGINE = False -WITH_BF_ODE = 'true' +WITH_BF_ODE = True BF_ODE = LIBDIR + '/ode' BF_ODE_INC = BF_ODE + '/include' BF_ODE_LIB = BF_ODE + '/lib/libode.a' -WITH_BF_BULLET = 'true' +WITH_BF_BULLET = True BF_BULLET = '#extern/bullet2/src' BF_BULLET_INC = '${BF_BULLET}' BF_BULLET_LIB = 'extern_bullet' @@ -101,9 +101,9 @@ BF_SOLID_LIB = 'extern_solid' BF_WINTAB = LIBDIR + '/wintab' BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE' -WITH_BF_YAFRAY = 'true' +WITH_BF_YAFRAY = True -#WITH_BF_NSPR = 'true' +#WITH_BF_NSPR = True #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr #BF_NSPR_LIB = @@ -123,18 +123,18 @@ BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIB = 'freetype' BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' -WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME +WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME BF_QUICKTIME = '/usr/local' BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' -WITH_BF_ICONV = 'false' +WITH_BF_ICONV = False BF_ICONV = LIBDIR + "/iconv" BF_ICONV_INC = '${BF_ICONV}/include' BF_ICONV_LIB = 'iconv' BF_ICONV_LIBPATH = '${BF_ICONV}/lib' # Mesa Libs should go here if your using them as well.... -WITH_BF_STATICOPENGL = 'false' +WITH_BF_STATICOPENGL = False BF_OPENGL = 'C:\\MingW' BF_OPENGL_INC = '${BF_OPENGL}/include' BF_OPENGL_LIBINC = '${BF_OPENGL}/lib' @@ -159,11 +159,11 @@ CC_WARN = [ '-Wall' ] LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++'] -BF_DEBUG = 'false' +BF_DEBUG = False BF_DEBUG_FLAGS= '-g' BF_PROFILE_FLAGS = ['-pg','-g'] -BF_PROFILE = 'false' +BF_PROFILE = False BF_BUILDDIR = '..\\build\\win32-mingw' BF_INSTALLDIR='..\\install\\win32-mingw' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 14fd8b3aac7..ec401e3ad57 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -1,11 +1,11 @@ LCGDIR = '#../lib/windows' LIBDIR = '${LCGDIR}' -WITH_BF_VERSE = 'false' +WITH_BF_VERSE = False BF_VERSE_INCLUDE = "#extern/verse/dist" # enable ffmpeg support -WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG +WITH_BF_FFMPEG = True # -DWITH_FFMPEG BF_FFMPEG = LIBDIR +'/ffmpeg' BF_FFMPEG_INC = '${BF_FFMPEG}/include' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' @@ -18,8 +18,8 @@ BF_PYTHON_BINARY = 'python' BF_PYTHON_LIB = 'python25' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' -WITH_BF_OPENAL = 'true' -WITH_BF_STATICOPENAL = 'false' +WITH_BF_OPENAL = True +WITH_BF_STATICOPENAL = False BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL ' BF_OPENAL_LIB = 'dxguid openal_static' @@ -29,16 +29,16 @@ BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' # TODO - are these useful on win32? # BF_CXX = '/usr' -# WITH_BF_STATICCXX = 'false' +# WITH_BF_STATICCXX = False # BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' -WITH_BF_ICONV = 'true' +WITH_BF_ICONV = True BF_ICONV = LIBDIR + '/iconv' BF_ICONV_INC = '${BF_ICONV}/include' BF_ICONV_LIB = 'iconv' BF_ICONV_LIBPATH = '${BF_ICONV}/lib' -WITH_BF_SDL = 'true' +WITH_BF_SDL = True BF_SDL = LIBDIR + '/sdl' BF_SDL_INC = '${BF_SDL}/include' BF_SDL_LIB = 'SDL.lib' @@ -49,11 +49,11 @@ BF_PTHREADS_INC = '${BF_PTHREADS}/include' BF_PTHREADS_LIB = 'pthreadVC2' BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib' -WITH_BF_FMOD = 'false' +WITH_BF_FMOD = False BF_FMOD = LIBDIR + '/fmod' -WITH_BF_OPENEXR = 'true' -WITH_BF_STATICOPENEXR = 'false' +WITH_BF_OPENEXR = True +WITH_BF_STATICOPENEXR = False BF_OPENEXR = LIBDIR + '/openexr' BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath ' BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread ' @@ -61,15 +61,15 @@ BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_vs2008' # Warning, this static lib configuration is untested! users of this OS please confirm. BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' -WITH_BF_DDS = 'true' +WITH_BF_DDS = True -WITH_BF_JPEG = 'true' +WITH_BF_JPEG = True BF_JPEG = LIBDIR + '/jpeg' BF_JPEG_INC = '${BF_JPEG}/include' BF_JPEG_LIB = 'libjpeg' BF_JPEG_LIBPATH = '${BF_JPEG}/lib' -WITH_BF_PNG = 'true' +WITH_BF_PNG = True BF_PNG = LIBDIR + '/png' BF_PNG_INC = '${BF_PNG}/include' BF_PNG_LIB = 'libpng_st' @@ -78,33 +78,33 @@ BF_PNG_LIBPATH = '${BF_PNG}/lib' BF_TIFF = LIBDIR + '/tiff' BF_TIFF_INC = '${BF_TIFF}/include' -WITH_BF_ZLIB = 'true' +WITH_BF_ZLIB = True BF_ZLIB = LIBDIR + '/zlib' BF_ZLIB_INC = '${BF_ZLIB}/include' BF_ZLIB_LIB = 'libz' BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib' -WITH_BF_INTERNATIONAL = 'true' +WITH_BF_INTERNATIONAL = True BF_GETTEXT = LIBDIR + '/gettext' BF_GETTEXT_INC = '${BF_GETTEXT}/include' BF_GETTEXT_LIB = 'gnu_gettext' BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' -WITH_BF_FTGL = 'true' +WITH_BF_FTGL = True BF_FTGL = LIBDIR + '/ftgl' BF_FTGL_INC = '${BF_FTGL}/include' BF_FTGL_LIB = 'extern_ftgl' -WITH_BF_GAMEENGINE = 'true' -WITH_BF_PLAYER = 'true' +WITH_BF_GAMEENGINE = True +WITH_BF_PLAYER = True -WITH_BF_ODE = 'true' +WITH_BF_ODE = True BF_ODE = LIBDIR + '/ode' BF_ODE_INC = BF_ODE + '/include' BF_ODE_LIB = BF_ODE + '/lib/libode.a' -WITH_BF_BULLET = 'true' +WITH_BF_BULLET = True BF_BULLET = '#extern/bullet2/src' BF_BULLET_INC = '${BF_BULLET}' BF_BULLET_LIB = 'extern_bullet' @@ -116,11 +116,11 @@ BF_SOLID_LIB = 'extern_solid' BF_WINTAB = LIBDIR + '/wintab' BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE' -WITH_BF_YAFRAY = 'true' +WITH_BF_YAFRAY = True -WITH_BF_BINRELOC = 'false' +WITH_BF_BINRELOC = False -#WITH_BF_NSPR = 'true' +#WITH_BF_NSPR = True #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr #BF_NSPR_LIB = @@ -135,21 +135,22 @@ WITH_BF_BINRELOC = 'false' # if this is not set. # # Be paranoid regarding library creation (do not update archives) -#BF_PARANOID = 'true' +#BF_PARANOID = True # enable freetype2 support for text objects +BF_WITH_FREETYPE = True BF_FREETYPE = LIBDIR + '/freetype' BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIB = 'freetype2ST' BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' -WITH_BF_QUICKTIME = 'true' # -DWITH_QUICKTIME +WITH_BF_QUICKTIME = True # -DWITH_QUICKTIME BF_QUICKTIME = LIBDIR + '/QTDevWin' BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes' BF_QUICKTIME_LIB = 'qtmlClient' BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries' -WITH_BF_STATICOPENGL = 'false' +WITH_BF_STATICOPENGL = False BF_OPENGL_INC = '${BF_OPENGL}/include' BF_OPENGL_LIBINC = '${BF_OPENGL}/lib' BF_OPENGL_LIB = 'opengl32 glu32' diff --git a/extern/bFTGL/SConscript b/extern/bFTGL/SConscript index c03992631e6..f377c61f01d 100644 --- a/extern/bFTGL/SConscript +++ b/extern/bFTGL/SConscript @@ -4,24 +4,6 @@ import os Import('env') -# Import the C flags set in the SConstruct file -#Import ('cflags') -#Import ('defines') -#Import ('user_options_dict') - -#if sys.platform=='linux2' or sys.platform=='linux-i386': -# ftgl_env.Append (CCFLAGS = ['-O2', '-ansi']) -#elif sys.platform=='win32': - #ftgl_env.Append (CCFLAGS = ['/O2']) -#elif sys.platform=='sunos': -# ftgl_env.Append (CCFLAGS = ['Xc', '-v', '-fast']) -#elif sys.platform=='darwin': -# ftgl_env.Append (CCFLAGS = ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math']) -#else: -# ftgl_env.Append (CCFLAGS = cflags) - -#ftgl_env.Append (CPPDEFINES = defines) - incs = 'include src ' + env['BF_FREETYPE_INC'] + ' ' + env['BF_OPENGL_INC'] defs = '' diff --git a/intern/SConscript b/intern/SConscript index f6092b7bd02..82c7739bf42 100644 --- a/intern/SConscript +++ b/intern/SConscript @@ -20,7 +20,7 @@ SConscript(['SoundSystem/SConscript', # perhaps get rid of intern/csg? NEW_CSG='false' -if env['BF_NO_ELBEEM'] == 0: +if not env['BF_NO_ELBEEM']: SConscript(['elbeem/SConscript']) if NEW_CSG=='false': diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript index 68892ac261c..f1c09423f04 100644 --- a/intern/elbeem/SConscript +++ b/intern/elbeem/SConscript @@ -7,7 +7,7 @@ sources = env.Glob('intern/*.cpp') defs = 'NOGUI ELBEEM_BLENDER=1' -if env['WITH_BF_OPENMP'] == 1: +if env['WITH_BF_OPENMP']: defs += ' PARALLEL' if env['OURPLATFORM']=='win32-vc': 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']: diff --git a/tools/Blender.py b/tools/Blender.py index 9baeb374af8..dd617f3c563 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -155,7 +155,7 @@ def setup_syslibs(lenv): ] if not lenv['WITH_BF_STATICPYTHON']: - if lenv['BF_DEBUG']==1 and lenv['OURPLATFORM'] in ('win32-vc'): + if lenv['BF_DEBUG'] and lenv['OURPLATFORM'] in ('win32-vc'): syslibs.append(lenv['BF_PYTHON_LIB']+'_d') else: syslibs.append(lenv['BF_PYTHON_LIB']) @@ -215,7 +215,7 @@ def buildinfo(lenv, build_type): build_rev = os.popen('svnversion').read()[:-1] # remove \n obj = [] - if lenv['BF_BUILDINFO']==1: #user_options_dict['USE_BUILDINFO'] == 1: + if lenv['BF_BUILDINFO']: if sys.platform=='win32': build_info_file = open("source/creator/winbuildinfo.h", 'w') build_info_file.write("char *build_date=\"%s\";\n"%build_date) diff --git a/tools/btools.py b/tools/btools.py index 7de1f47a91c..e16e78488de 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -47,7 +47,7 @@ def validate_arguments(args, bc): 'WITH_BF_GAMEENGINE', 'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB', 'BF_SOLID', 'BF_SOLID_INC', 'BF_WINTAB', 'BF_WINTAB_INC', 'WITH_BF_YAFRAY', - 'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', + 'WITH_BF_FREETYPE', 'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', 'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH', 'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', 'BF_OPENGL_LINKFLAGS', 'WITH_BF_FTGL', 'BF_FTGL', 'BF_FTGL_INC', 'BF_FTGL_LIB', @@ -137,7 +137,7 @@ def read_opts(cfg, args): ('VERSE_BUILD_BINARY', 'Build a release or debug binary.', 'release'), ('VERSE_BUILD_DIR', 'Target directory for intermediate files.', "${BF_BUILDDIR}/extern/verse"), ('VERSE_REGEN_PROTO', 'Whether to regenerate the protocol files', 'yes'), - (BoolOption('WITH_BF_VERSE', 'Use VERSE if true', 'false')), + (BoolOption('WITH_BF_VERSE', 'Use VERSE if true', False)), ('BF_VERSE_INCLUDE', 'verse include dir', '/usr/include'), ('LCGDIR', 'location of cvs lib dir'), ('VERSE_BUILD_BINARY', 'Build a release or debug binary.', 'release'), @@ -153,20 +153,20 @@ def read_opts(cfg, args): ('BF_PYTHON_LIB_STATIC', 'Python static libraries', ''), ('BF_PYTHON_LIBPATH', 'Library path', ''), ('BF_PYTHON_LINKFLAGS', 'Python link flags', ''), - (BoolOption('WITH_BF_STATICPYTHON', 'Staticly link to python', 'false')), + (BoolOption('WITH_BF_STATICPYTHON', 'Staticly link to python', False)), - (BoolOption('BF_NO_ELBEEM', 'Disable Fluid Sim', 'false')), - (BoolOption('WITH_BF_YAFRAY', 'Enable Yafray', 'true')), + (BoolOption('BF_NO_ELBEEM', 'Disable Fluid Sim', False)), + (BoolOption('WITH_BF_YAFRAY', 'Enable Yafray', True)), - (BoolOption('WITH_BF_OPENAL', 'Use OpenAL if true', '')), + (BoolOption('WITH_BF_OPENAL', 'Use OpenAL if true', False)), ('BF_OPENAL', 'base path for OpenAL', ''), ('BF_OPENAL_INC', 'include path for python headers', ''), ('BF_OPENAL_LIB', 'Path to OpenAL library', ''), ('BF_OPENAL_LIB_STATIC', 'Path to OpenAL static library', ''), ('BF_OPENAL_LIBPATH', 'Path to OpenAL library', ''), - (BoolOption('WITH_BF_STATICOPENAL', 'Staticly link to openal', 'false')), + (BoolOption('WITH_BF_STATICOPENAL', 'Staticly link to openal', False)), - (BoolOption('WITH_BF_SDL', 'Use SDL if true', '')), + (BoolOption('WITH_BF_SDL', 'Use SDL if true', False)), ('BF_SDL', 'SDL base path', ''), ('BF_SDL_INC', 'SDL include path', ''), #$(shell $(BF_SDL)/bin/sdl-config --cflags) ('BF_SDL_LIB', 'SDL library', ''), #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer @@ -177,20 +177,20 @@ def read_opts(cfg, args): ('BF_PTHREADS_LIB', 'Pthreads library', ''), ('BF_PTHREADS_LIBPATH', 'Pthreads library path', ''), - (BoolOption('WITH_BF_FMOD', 'Use FMOD if true', 'false')), + (BoolOption('WITH_BF_FMOD', 'Use FMOD if true', False)), # BF_FMOD = $(LCGDIR)/fmod - (BoolOption('WITH_BF_OPENEXR', 'Use OPENEXR if true', 'true')), - (BoolOption('WITH_BF_STATICOPENEXR', 'Staticly link to OpenEXR', 'false')), + (BoolOption('WITH_BF_OPENEXR', 'Use OPENEXR if true', True)), + (BoolOption('WITH_BF_STATICOPENEXR', 'Staticly link to OpenEXR', False)), ('BF_OPENEXR', 'OPENEXR base path', ''), ('BF_OPENEXR_INC', 'OPENEXR include path', ''), ('BF_OPENEXR_LIB', 'OPENEXR library', ''), ('BF_OPENEXR_LIBPATH', 'OPENEXR library path', ''), ('BF_OPENEXR_LIB_STATIC', 'OPENEXR static library', ''), - (BoolOption('WITH_BF_DDS', 'Use DDS if true', 'true')), + (BoolOption('WITH_BF_DDS', 'Use DDS if true', True)), - (BoolOption('WITH_BF_FFMPEG', 'Use FFMPEG if true', 'false')), + (BoolOption('WITH_BF_FFMPEG', 'Use FFMPEG if true', False)), ('BF_FFMPEG', 'FFMPEG base path', ''), ('BF_FFMPEG_LIB', 'FFMPEG library', ''), ('BF_FFMPEG_EXTRA', 'FFMPEG flags that must be preserved', ''), @@ -199,29 +199,29 @@ def read_opts(cfg, args): ('BF_FFMPEG_LIBPATH', 'FFMPEG library path', ''), (BoolOption('WITH_BF_OGG', 'Use OGG, THEORA, VORBIS in FFMPEG if true', - 'false')), + False)), ('BF_OGG', 'OGG base path', ''), ('BF_OGG_LIB', 'OGG library', ''), - (BoolOption('WITH_BF_JPEG', 'Use JPEG if true', 'true')), + (BoolOption('WITH_BF_JPEG', 'Use JPEG if true', True)), ('BF_JPEG', 'JPEG base path', ''), ('BF_JPEG_INC', 'JPEG include path', ''), ('BF_JPEG_LIB', 'JPEG library', ''), ('BF_JPEG_LIBPATH', 'JPEG library path', ''), - (BoolOption('WITH_BF_OPENJPEG', 'Use OPENJPEG if true', 'false')), + (BoolOption('WITH_BF_OPENJPEG', 'Use OPENJPEG if true', False)), ('BF_OPENJPEG', 'OPENJPEG base path', ''), ('BF_OPENJPEG_INC', 'OPENJPEG include path', ''), ('BF_OPENJPEG_LIB', 'OPENJPEG library', ''), ('BF_OPENJPEG_LIBPATH', 'OPENJPEG library path', ''), - (BoolOption('WITH_BF_REDCODE', 'Use REDCODE if true', 'false')), + (BoolOption('WITH_BF_REDCODE', 'Use REDCODE if true', False)), ('BF_REDCODE', 'REDCODE base path', ''), ('BF_REDCODE_INC', 'REDCODE include path', ''), ('BF_REDCODE_LIB', 'REDCODE library', ''), ('BF_REDCODE_LIBPATH', 'REDCODE library path', ''), - (BoolOption('WITH_BF_PNG', 'Use PNG if true', 'true')), + (BoolOption('WITH_BF_PNG', 'Use PNG if true', True)), ('BF_PNG', 'PNG base path', ''), ('BF_PNG_INC', 'PNG include path', ''), ('BF_PNG_LIB', 'PNG library', ''), @@ -230,33 +230,33 @@ def read_opts(cfg, args): ('BF_TIFF', 'TIFF base path', ''), ('BF_TIFF_INC', 'TIFF include path', ''), - (BoolOption('WITH_BF_ZLIB', 'Use ZLib if true', 'true')), + (BoolOption('WITH_BF_ZLIB', 'Use ZLib if true', True)), ('BF_ZLIB', 'ZLib base path', ''), ('BF_ZLIB_INC', 'ZLib include path', ''), ('BF_ZLIB_LIB', 'ZLib library', ''), ('BF_ZLIB_LIBPATH', 'ZLib library path', ''), - (BoolOption('WITH_BF_INTERNATIONAL', 'Use Gettext and Freetype if true', 'true')), + (BoolOption('WITH_BF_INTERNATIONAL', 'Use Gettext and Freetype if true', True)), ('BF_GETTEXT', 'gettext base path', ''), ('BF_GETTEXT_INC', 'gettext include path', ''), ('BF_GETTEXT_LIB', 'gettext library', ''), ('BF_GETTEXT_LIBPATH', 'gettext library path', ''), - (BoolOption('WITH_BF_ICONV', 'Use iconv if true', 'true')), + (BoolOption('WITH_BF_ICONV', 'Use iconv if true', True)), ('BF_ICONV', 'iconv base path', ''), ('BF_ICONV_INC', 'iconv include path', ''), ('BF_ICONV_LIB', 'iconv library', ''), ('BF_ICONV_LIBPATH', 'iconv library path', ''), - (BoolOption('WITH_BF_GAMEENGINE', 'Build with gameengine' , 'true')), + (BoolOption('WITH_BF_GAMEENGINE', 'Build with gameengine' , True)), - (BoolOption('WITH_BF_ODE', 'Use ODE if true', 'true')), + (BoolOption('WITH_BF_ODE', 'Use ODE if true', True)), ('BF_ODE', 'ODE base path', ''), ('BF_ODE_INC', 'ODE include path' , ''), ('BF_ODE_LIB', 'ODE library', ''), - (BoolOption('WITH_BF_BULLET', 'Use Bullet if true', 'true')), + (BoolOption('WITH_BF_BULLET', 'Use Bullet if true', True)), ('BF_BULLET', 'Bullet base dir', ''), ('BF_BULLET_INC', 'Bullet include path', ''), ('BF_BULLET_LIB', 'Bullet library', ''), @@ -266,10 +266,10 @@ def read_opts(cfg, args): ('BF_WINTAB', 'WinTab base dir', ''), ('BF_WINTAB_INC', 'WinTab include dir', ''), ('BF_CXX', 'c++ base path for libstdc++, only used when static linking', ''), - (BoolOption('WITH_BF_STATICCXX', 'static link to stdc++', 'false')), + (BoolOption('WITH_BF_STATICCXX', 'static link to stdc++', False)), ('BF_CXX_LIB_STATIC', 'static library path for stdc++', ''), ## -##WITH_BF_NSPR = 'true' +##WITH_BF_NSPR = True ##BF_NSPR = $(LCGDIR)/nspr ##BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr ##BF_NSPR_LIB = @@ -283,23 +283,24 @@ def read_opts(cfg, args): ### if this is not set. ## ### Be paranoid regarding library creation (do not update archives) -##BF_PARANOID = 'true' +##BF_PARANOID = True ## ### enable freetype2 support for text objects + (BoolOption('WITH_BF_FREETYPE', 'Use FreeType2 if true', False)), ('BF_FREETYPE', 'Freetype base path', ''), ('BF_FREETYPE_INC', 'Freetype include path', ''), ('BF_FREETYPE_LIB', 'Freetype library', ''), ('BF_FREETYPE_LIBPATH', 'Freetype library path', ''), - (BoolOption('WITH_BF_OPENMP', 'Use OpenMP if true', 'false')), + (BoolOption('WITH_BF_OPENMP', 'Use OpenMP if true', False)), - (BoolOption('WITH_BF_QUICKTIME', 'Use QuickTime if true', 'false')), + (BoolOption('WITH_BF_QUICKTIME', 'Use QuickTime if true', False)), ('BF_QUICKTIME', 'QuickTime base path', ''), ('BF_QUICKTIME_INC', 'QuickTime include path', ''), ('BF_QUICKTIME_LIB', 'QuickTime library', ''), ('BF_QUICKTIME_LIBPATH', 'QuickTime library path', ''), - (BoolOption('WITH_BF_STATICOPENGL', 'Use MESA if true', 'true')), + (BoolOption('WITH_BF_STATICOPENGL', 'Use MESA if true', True)), ('BF_OPENGL', 'OpenGL base path', ''), ('BF_OPENGL_INC', 'OpenGL include path', ''), ('BF_OPENGL_LIB', 'OpenGL libraries', ''), @@ -307,13 +308,13 @@ def read_opts(cfg, args): ('BF_OPENGL_LIB_STATIC', 'OpenGL static libraries', ''), ('BF_OPENGL_LINKFLAGS', 'OpenGL link flags', ''), - (BoolOption('WITH_BF_FTGL', 'Use FTGL if true', 'true')), + (BoolOption('WITH_BF_FTGL', 'Use FTGL if true', True)), ('BF_FTGL', 'FTGL base path', ''), ('BF_FTGL_INC', 'FTGL include path', ''), ('BF_FTGL_LIB', 'FTGL libraries', ''), - (BoolOption('WITH_BF_PLAYER', 'Build blenderplayer if true', 'false')), - (BoolOption('WITH_BF_NOBLENDER', 'Do not build blender if true', 'false')), + (BoolOption('WITH_BF_PLAYER', 'Build blenderplayer if true', False)), + (BoolOption('WITH_BF_NOBLENDER', 'Do not build blender if true', False)), ('CFLAGS', 'C-compiler flags', ''), ('CCFLAGS', 'C++-compiler flags', ''), @@ -327,13 +328,13 @@ def read_opts(cfg, args): ('LLIBS', 'Platform libs', ''), ('PLATFORM_LINKFLAGS', 'Platform linkflags', ''), - (BoolOption('BF_PROFILE', 'Add profiling information if true', 'false')), + (BoolOption('BF_PROFILE', 'Add profiling information if true', False)), ('BF_PROFILE_FLAGS', 'Profiling flags', ''), - (BoolOption('BF_DEBUG', 'Add debug flags if true', 'false')), + (BoolOption('BF_DEBUG', 'Add debug flags if true', False)), ('BF_DEBUG_FLAGS', 'Debug flags', ''), - (BoolOption('BF_BSC', 'Create .bsc files (msvc only)', 'true')), + (BoolOption('BF_BSC', 'Create .bsc files (msvc only)', True)), ('BF_BUILDDIR', 'Build dir', ''), ('BF_INSTALLDIR', 'Installation dir', ''), @@ -342,18 +343,18 @@ def read_opts(cfg, args): ('CC', 'C compiler to use', ''), ('CXX', 'C++ compiler to use', ''), - (BoolOption('BF_BUILDINFO', 'Buildtime in splash if true', 'true')), + (BoolOption('BF_BUILDINFO', 'Buildtime in splash if true', True)), - (BoolOption('BF_TWEAK_MODE', 'Enable tweak mode if true', 'false')), - (BoolOption('BF_SPLIT_SRC', 'Split src lib into several chunks if true', 'false')), - (BoolOption('WITHOUT_BF_INSTALL', 'dont install if true', 'false')), - (BoolOption('BF_FANCY', 'Enable fancy output if true', 'true')), - (BoolOption('BF_QUIET', 'Enable silent output if true', 'true')), - (BoolOption('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', 'false')), + (BoolOption('BF_TWEAK_MODE', 'Enable tweak mode if true', False)), + (BoolOption('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)), + (BoolOption('WITHOUT_BF_INSTALL', 'dont install if true', False)), + (BoolOption('BF_FANCY', 'Enable fancy output if true', True)), + (BoolOption('BF_QUIET', 'Enable silent output if true', True)), + (BoolOption('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', False)), ('BF_X264_CONFIG', 'configuration flags for x264', ''), ('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''), - (BoolOption('WITH_BF_DOCS', 'Generate API documentation', 'false')), + (BoolOption('WITH_BF_DOCS', 'Generate API documentation', False)), ('BF_CONFIG', 'SCons python config file used to set default options', 'user_config.py'), -- cgit v1.2.3