From 3d4a14149b6ee65a7d4675a63687afa23610e60c Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Sat, 7 Apr 2012 18:26:54 +0000 Subject: Scons: * Some code and comment cleanup * Remove cmake equivalent variable comments * Remove some non used parameters from config files and btools: WITH_BF_FMOD, BF_VERSION. * Remove some commented non-used variables --- build_files/scons/config/linux-config.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'build_files/scons/config/linux-config.py') diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py index 63022bb1117..cd97ffe8b56 100644 --- a/build_files/scons/config/linux-config.py +++ b/build_files/scons/config/linux-config.py @@ -105,13 +105,12 @@ BF_BULLET = '#extern/bullet2/src' BF_BULLET_INC = '${BF_BULLET}' BF_BULLET_LIB = 'extern_bullet' -# enable freetype2 support for text objects BF_FREETYPE = '/usr' BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2' BF_FREETYPE_LIB = 'freetype' #BF_FREETYPE_LIB_STATIC = '${BF_FREETYPE}/lib/libfreetype.a' -WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME +WITH_BF_QUICKTIME = False BF_QUICKTIME = '/usr/local' BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' @@ -124,7 +123,7 @@ BF_ICONV_LIBPATH = '${BF_ICONV}/lib' WITH_BF_BINRELOC = True # enable ffmpeg support -WITH_BF_FFMPEG = True # -DWITH_FFMPEG +WITH_BF_FFMPEG = True BF_FFMPEG = LIBDIR + '/ffmpeg' if os.path.exists(LCGDIR + '/ffmpeg'): WITH_BF_STATICFFMPEG = True -- cgit v1.2.3