Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2012-04-07 22:26:54 +0400
committerThomas Dinges <blender@dingto.org>2012-04-07 22:26:54 +0400
commit3d4a14149b6ee65a7d4675a63687afa23610e60c (patch)
tree95b286a6aef852a60133c742c35236db48429a13 /build_files/scons/config/linuxcross-config.py
parentfec5221a65e9fe762f9bcbd2fd46317dc647a4ad (diff)
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
Diffstat (limited to 'build_files/scons/config/linuxcross-config.py')
-rw-r--r--build_files/scons/config/linuxcross-config.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/build_files/scons/config/linuxcross-config.py b/build_files/scons/config/linuxcross-config.py
index 5e2c1d67d1f..6866241793b 100644
--- a/build_files/scons/config/linuxcross-config.py
+++ b/build_files/scons/config/linuxcross-config.py
@@ -100,14 +100,13 @@ BF_BULLET_LIB = 'extern_bullet'
BF_WINTAB = LIBDIR + '/wintab'
BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
-# enable freetype2 support for text objects
BF_WITH_FREETYPE = True
BF_FREETYPE = LIBDIR + '/gcc/freetype'
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
BF_QUICKTIME = '/usr/local'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
@@ -120,7 +119,7 @@ BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
WITH_BF_BINRELOC = False
# enable ffmpeg support
-WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
BF_FFMPEG = LIBDIR + '/ffmpeg'
BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'