[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45465] trunk/blender/build_files/scons: Scons:
Thomas Dinges
blender at dingto.org
Sat Apr 7 20:26:54 CEST 2012
Revision: 45465
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45465
Author: dingto
Date: 2012-04-07 18:26:54 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/blender/build_files/scons/config/darwin-config.py
trunk/blender/build_files/scons/config/freebsd7-config.py
trunk/blender/build_files/scons/config/freebsd8-config.py
trunk/blender/build_files/scons/config/freebsd9-config.py
trunk/blender/build_files/scons/config/linux-config.py
trunk/blender/build_files/scons/config/linuxcross-config.py
trunk/blender/build_files/scons/config/win32-mingw-config.py
trunk/blender/build_files/scons/config/win32-vc-config.py
trunk/blender/build_files/scons/config/win64-vc-config.py
trunk/blender/build_files/scons/tools/btools.py
Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py 2012-04-07 18:16:25 UTC (rev 45464)
+++ trunk/blender/build_files/scons/config/darwin-config.py 2012-04-07 18:26:54 UTC (rev 45465)
@@ -101,7 +101,7 @@
WITH_BF_OPENMP = False
# enable ffmpeg support
-WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
BF_FFMPEG = LIBDIR + '/ffmpeg'
BF_FFMPEG_INC = "${BF_FFMPEG}/include"
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
@@ -233,24 +233,6 @@
BF_FFTW3_LIB = 'libfftw3'
BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
-#WITH_BF_NSPR = True
-#BF_NSPR = $(LIBDIR)/nspr
-#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
-#BF_NSPR_LIB =
-
-# Uncomment the following line to use Mozilla inplace of netscape
-#CPPFLAGS += -DMOZ_NOT_NET
-# Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LIBDIR)/mozilla
-#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
-#BF_MOZILLA_LIB =
-# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
-# if this is not set.
-#
-# Be paranoid regarding library creation (do not update archives)
-#BF_PARANOID = True
-
-# enable freetype2 support for text objects
BF_FREETYPE = LIBDIR + '/freetype'
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
Modified: trunk/blender/build_files/scons/config/freebsd7-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd7-config.py 2012-04-07 18:16:25 UTC (rev 45464)
+++ trunk/blender/build_files/scons/config/freebsd7-config.py 2012-04-07 18:26:54 UTC (rev 45465)
@@ -91,13 +91,12 @@
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-# enable freetype2 support for text objects
BF_FREETYPE = '/usr/local'
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
### XXX Find what this actually wants; it doesn't want libquicktime.
-WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False
BF_QUICKTIME = '/usr/local'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
@@ -110,7 +109,7 @@
WITH_BF_BINRELOC = True
# enable ffmpeg support
-WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
BF_FFMPEG = '/usr/local'
BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
Modified: trunk/blender/build_files/scons/config/freebsd8-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd8-config.py 2012-04-07 18:16:25 UTC (rev 45464)
+++ trunk/blender/build_files/scons/config/freebsd8-config.py 2012-04-07 18:26:54 UTC (rev 45465)
@@ -91,13 +91,12 @@
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-# enable freetype2 support for text objects
BF_FREETYPE = '/usr/local'
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
### XXX Find what this actually wants; it doesn't want libquicktime.
-WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False
BF_QUICKTIME = '/usr/local'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
@@ -110,7 +109,7 @@
WITH_BF_BINRELOC = True
# enable ffmpeg support
-WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
BF_FFMPEG = '/usr/local'
BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
Modified: trunk/blender/build_files/scons/config/freebsd9-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd9-config.py 2012-04-07 18:16:25 UTC (rev 45464)
+++ trunk/blender/build_files/scons/config/freebsd9-config.py 2012-04-07 18:26:54 UTC (rev 45465)
@@ -91,13 +91,12 @@
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-# enable freetype2 support for text objects
BF_FREETYPE = '/usr/local'
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
### XXX Find what this actually wants; it doesn't want libquicktime.
-WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False
BF_QUICKTIME = '/usr/local'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
@@ -110,7 +109,7 @@
WITH_BF_BINRELOC = True
# enable ffmpeg support
-WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
BF_FFMPEG = '/usr/local'
BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
Modified: trunk/blender/build_files/scons/config/linux-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linux-config.py 2012-04-07 18:16:25 UTC (rev 45464)
+++ trunk/blender/build_files/scons/config/linux-config.py 2012-04-07 18:26:54 UTC (rev 45465)
@@ -105,13 +105,12 @@
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 @@
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
Modified: trunk/blender/build_files/scons/config/linuxcross-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linuxcross-config.py 2012-04-07 18:16:25 UTC (rev 45464)
+++ trunk/blender/build_files/scons/config/linuxcross-config.py 2012-04-07 18:26:54 UTC (rev 45465)
@@ -100,14 +100,13 @@
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 @@
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'
Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py 2012-04-07 18:16:25 UTC (rev 45464)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py 2012-04-07 18:26:54 UTC (rev 45465)
@@ -112,13 +112,12 @@
BF_WINTAB = LIBDIR + '/wintab'
BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
-# enable freetype2 support for text objects
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'
Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py 2012-04-07 18:16:25 UTC (rev 45464)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py 2012-04-07 18:26:54 UTC (rev 45465)
@@ -1,8 +1,7 @@
LCGDIR = '#../lib/windows'
LIBDIR = '${LCGDIR}'
-# enable ffmpeg support
-WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
BF_FFMPEG = LIBDIR +'/ffmpeg'
BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc'
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
@@ -58,7 +57,6 @@
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 '
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
@@ -108,14 +106,13 @@
WITH_BF_BINRELOC = False
-# 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 = False # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False
BF_QUICKTIME = LIBDIR + '/QTDevWin'
BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes'
BF_QUICKTIME_LIB = 'qtmlClient'
Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py 2012-04-07 18:16:25 UTC (rev 45464)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py 2012-04-07 18:26:54 UTC (rev 45465)
@@ -1,8 +1,7 @@
LCGDIR = '#../lib/win64'
LIBDIR = '${LCGDIR}'
-# enable ffmpeg support
-WITH_BF_FFMPEG = True # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
BF_FFMPEG = LIBDIR +'/ffmpeg'
BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}/include/msvc '
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
@@ -29,11 +28,6 @@
BF_SNDFILE_LIB = 'libsndfile-1'
BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
-# TODO - are these useful on win32?
-# BF_CXX = '/usr'
-# WITH_BF_STATICCXX = False
-# BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-
WITH_BF_ICONV = True
BF_ICONV = LIBDIR + '/iconv'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list