diff options
author | Jens Verwiebe <info@jensverwiebe.de> | 2013-04-06 22:06:06 +0400 |
---|---|---|
committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-04-06 22:06:06 +0400 |
commit | be2626f9f471677e6248fdfb8bb2a31a67e63c43 (patch) | |
tree | 43a221f23a4dc9e65b798fdb11277cf595b81c89 /build_files/scons | |
parent | 464a149b2120f65aef4a667ae27e608e82775497 (diff) |
Fix freestyle compile with scons
Diffstat (limited to 'build_files/scons')
-rw-r--r-- | build_files/scons/config/darwin-config.py | 3 | ||||
-rw-r--r-- | build_files/scons/tools/btools.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 267505bc449..64fe395caa1 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -110,6 +110,9 @@ if CC[:-2].endswith('4.6'): else: WITH_BF_OPENMP = False +# enable freestyle support +WITH_BF_FREESTYLE = True + # enable ffmpeg support WITH_BF_FFMPEG = True BF_FFMPEG = LIBDIR + '/ffmpeg' diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index e35c28cedf0..885c8f3d4c4 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -96,7 +96,7 @@ def print_arguments(args, bc): 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 @@ def read_opts(env, cfg, args): 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', ''), |