[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55851] trunk/blender/build_files/scons: Fix freestyle compile with scons

[jens verwiebe]

Revision: 55851
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55851
Author:   jensverwiebe
Date:     2013-04-06 18:06:06 +0000 (Sat, 06 Apr 2013)
Log Message:
-----------
Fix freestyle compile with scons

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/darwin-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	2013-04-06 17:03:39 UTC (rev 55850)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2013-04-06 18:06:06 UTC (rev 55851)
@@ -110,6 +110,9 @@
 else:
     WITH_BF_OPENMP = False
 
+# enable freestyle  support
+WITH_BF_FREESTYLE = True
+
 # enable ffmpeg  support
 WITH_BF_FFMPEG = True
 BF_FFMPEG = LIBDIR + '/ffmpeg'

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2013-04-06 17:03:39 UTC (rev 55850)
+++ trunk/blender/build_files/scons/tools/btools.py	2013-04-06 18:06:06 UTC (rev 55851)
@@ -96,7 +96,7 @@
 
 def validate_arguments(args, bc):
     opts_list = [
-            'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', 
+            'WITH_BF_FREESTYLE', 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS',
             'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
             'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
             'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH', 'WITH_BF_JACK_DYNLOAD',
@@ -252,6 +252,7 @@
     localopts.AddVariables(
         ('LCGDIR', 'Location of SVN lib dir'),
         ('LIBDIR', 'Root dir of libs'),
+		(BoolVariable('WITH_BF_FREESTYLE', 'Compile with freestyle', True)),
         (BoolVariable('WITH_BF_PYTHON', 'Compile with python', True)),
         (BoolVariable('WITH_BF_PYTHON_SAFETY', 'Internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency)', False)),
         ('BF_PYTHON', 'Base path for python', ''),