svn merge -r 12937:13095 https://svn.blender.org/svnroot/bf-blender/trunk/blender

[blender-staging.git] / tools / btools.py

diff --git a/tools/btools.py b/tools/btools.py
index 9f5a028f845f91d14e6fdd4b9eac5c95c07d00d7..8e4848a39be4c55f2a5996fb4dd9313ad13bca8d 100755 (executable)
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -1,3 +1,4 @@
+
 import os
 import os.path
 import SCons.Options
@@ -55,6 +56,8 @@ def validate_arguments(args, bc):
             'VERSE_BUILD_BINARY', 'VERSE_BUILD_DIR', 'VERSE_REGEN_PROTO',
             'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
             'WITHOUT_BF_INSTALL',
+            'WITH_BF_OPENMP',
+            'WITHOUT_BF_INSTALL',
             'BF_FANCY',
             ]
 
@@ -247,6 +250,8 @@ def read_opts(cfg, args):
         ('BF_FREETYPE_LIB', 'Freetype library', ''),
         ('BF_FREETYPE_LIBPATH', 'Freetype library path', ''),
 
+       (BoolOption('WITH_BF_OPENMP', 'Use OpenMP if true', 'false')),
+
         (BoolOption('WITH_BF_QUICKTIME', 'Use QuickTime if true', 'false')),
         ('BF_QUICKTIME', 'QuickTime base path', ''),
         ('BF_QUICKTIME_INC', 'QuickTime include path', ''),