[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48720] branches/soc-2012-bratwurst/ build_files/scons/config: - SCons: add WITH_BF_ASSIMP=False and WITH_BF_FBX =False to all configs.

[Alexander Gessler]

Revision: 48720
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48720
Author:   aramis_acg
Date:     2012-07-08 00:35:13 +0000 (Sun, 08 Jul 2012)
Log Message:
-----------
- SCons: add WITH_BF_ASSIMP=False and WITH_BF_FBX=False to all configs.

Modified Paths:
--------------
    branches/soc-2012-bratwurst/build_files/scons/config/darwin-config.py
    branches/soc-2012-bratwurst/build_files/scons/config/freebsd7-config.py
    branches/soc-2012-bratwurst/build_files/scons/config/freebsd8-config.py
    branches/soc-2012-bratwurst/build_files/scons/config/freebsd9-config.py
    branches/soc-2012-bratwurst/build_files/scons/config/linux-config.py
    branches/soc-2012-bratwurst/build_files/scons/config/linuxcross-config.py
    branches/soc-2012-bratwurst/build_files/scons/config/win32-mingw-config.py
    branches/soc-2012-bratwurst/build_files/scons/config/win32-vc-config.py
    branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py
    branches/soc-2012-bratwurst/build_files/scons/config/win64-vc-config.py

Modified: branches/soc-2012-bratwurst/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/darwin-config.py	2012-07-08 00:04:41 UTC (rev 48719)
+++ branches/soc-2012-bratwurst/build_files/scons/config/darwin-config.py	2012-07-08 00:35:13 UTC (rev 48720)
@@ -252,6 +252,10 @@
 BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries'
 BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL']
 
+# note: WITH_BF_FBX==True needs WITH_BF_ASSIMP to be enabled as well
+WITH_BF_ASSIMP = False
+WITH_BF_FBX = False
+
 #OpenCollada flags
 WITH_BF_COLLADA = True
 BF_COLLADA = '#source/blender/collada'

Modified: branches/soc-2012-bratwurst/build_files/scons/config/freebsd7-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/freebsd7-config.py	2012-07-08 00:04:41 UTC (rev 48719)
+++ branches/soc-2012-bratwurst/build_files/scons/config/freebsd7-config.py	2012-07-08 00:35:13 UTC (rev 48720)
@@ -148,6 +148,10 @@
 BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
 BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
 
+# note: WITH_BF_FBX==True needs WITH_BF_ASSIMP to be enabled as well
+WITH_BF_ASSIMP = False
+WITH_BF_FBX = False
+
 WITH_BF_COLLADA = False
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'

Modified: branches/soc-2012-bratwurst/build_files/scons/config/freebsd8-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/freebsd8-config.py	2012-07-08 00:04:41 UTC (rev 48719)
+++ branches/soc-2012-bratwurst/build_files/scons/config/freebsd8-config.py	2012-07-08 00:35:13 UTC (rev 48720)
@@ -148,6 +148,10 @@
 BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
 BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
 
+# note: WITH_BF_FBX==True needs WITH_BF_ASSIMP to be enabled as well
+WITH_BF_ASSIMP = False
+WITH_BF_FBX = False
+
 WITH_BF_COLLADA = False
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'

Modified: branches/soc-2012-bratwurst/build_files/scons/config/freebsd9-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/freebsd9-config.py	2012-07-08 00:04:41 UTC (rev 48719)
+++ branches/soc-2012-bratwurst/build_files/scons/config/freebsd9-config.py	2012-07-08 00:35:13 UTC (rev 48720)
@@ -148,6 +148,10 @@
 BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
 BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
 
+# note: WITH_BF_FBX==True needs WITH_BF_ASSIMP to be enabled as well
+WITH_BF_ASSIMP = False
+WITH_BF_FBX = False
+
 WITH_BF_COLLADA = False
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'

Modified: branches/soc-2012-bratwurst/build_files/scons/config/linux-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/linux-config.py	2012-07-08 00:04:41 UTC (rev 48719)
+++ branches/soc-2012-bratwurst/build_files/scons/config/linux-config.py	2012-07-08 00:35:13 UTC (rev 48720)
@@ -177,6 +177,11 @@
 BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
 BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
 
+# note: WITH_BF_FBX==True needs WITH_BF_ASSIMP to be enabled as well
+WITH_BF_ASSIMP = False
+WITH_BF_FBX = False
+
+
 WITH_BF_COLLADA = False
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'

Modified: branches/soc-2012-bratwurst/build_files/scons/config/linuxcross-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/linuxcross-config.py	2012-07-08 00:04:41 UTC (rev 48719)
+++ branches/soc-2012-bratwurst/build_files/scons/config/linuxcross-config.py	2012-07-08 00:35:13 UTC (rev 48720)
@@ -155,6 +155,10 @@
 BF_OPENMP_INC = '${BF_OPENMP}/include'
 BF_OPENMP_LIBPATH = '${BF_OPENMP}/lib'
 
+# note: WITH_BF_FBX==True needs WITH_BF_ASSIMP to be enabled as well
+WITH_BF_ASSIMP = False
+WITH_BF_FBX = False
+
 WITH_BF_COLLADA = False
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'

Modified: branches/soc-2012-bratwurst/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/win32-mingw-config.py	2012-07-08 00:04:41 UTC (rev 48719)
+++ branches/soc-2012-bratwurst/build_files/scons/config/win32-mingw-config.py	2012-07-08 00:35:13 UTC (rev 48720)
@@ -140,6 +140,10 @@
              '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
              '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
 
+# note: WITH_BF_FBX==True needs WITH_BF_ASSIMP to be enabled as well
+WITH_BF_ASSIMP = False
+WITH_BF_FBX = False
+
 WITH_BF_COLLADA = True
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'

Modified: branches/soc-2012-bratwurst/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/win32-vc-config.py	2012-07-08 00:04:41 UTC (rev 48719)
+++ branches/soc-2012-bratwurst/build_files/scons/config/win32-vc-config.py	2012-07-08 00:35:13 UTC (rev 48720)
@@ -133,6 +133,10 @@
 WITH_BF_REDCODE = False  
 BF_REDCODE_INC = '#extern'
 
+# note: WITH_BF_FBX==True needs WITH_BF_ASSIMP to be enabled as well
+WITH_BF_ASSIMP = False
+WITH_BF_FBX = False
+
 WITH_BF_COLLADA = True
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'

Modified: branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py	2012-07-08 00:04:41 UTC (rev 48719)
+++ branches/soc-2012-bratwurst/build_files/scons/config/win64-mingw-config.py	2012-07-08 00:35:13 UTC (rev 48720)
@@ -137,6 +137,10 @@
              '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
              '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
 
+# note: WITH_BF_FBX==True needs WITH_BF_ASSIMP to be enabled as well
+WITH_BF_ASSIMP = False
+WITH_BF_FBX = False
+
 WITH_BF_COLLADA = True
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'

Modified: branches/soc-2012-bratwurst/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2012-bratwurst/build_files/scons/config/win64-vc-config.py	2012-07-08 00:04:41 UTC (rev 48719)
+++ branches/soc-2012-bratwurst/build_files/scons/config/win64-vc-config.py	2012-07-08 00:35:13 UTC (rev 48720)
@@ -129,6 +129,10 @@
 WITH_BF_REDCODE = False  
 BF_REDCODE_INC = '#extern'
 
+# note: WITH_BF_FBX==True needs WITH_BF_ASSIMP to be enabled as well
+WITH_BF_ASSIMP = False
+WITH_BF_FBX = False
+
 WITH_BF_COLLADA = True
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'