Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2011-10-02 21:53:52 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2011-10-02 21:53:52 +0400
commit1023ed4e4d62710357cafbbeb81ff55c4fdcebcc (patch)
treec0c4c633a6e82950d9b0dc6b45d4071c4d5e5646 /build_files
parentda73642ed1415e4547d485cbfea42672c9da0695 (diff)
Make sure that default settings have OpenMP support by default (also good for buildbots).
Note that builders that don't have VS pro version need to manually disable this setting in their respective user-config.py
Diffstat (limited to 'build_files')
-rw-r--r--build_files/scons/config/win32-vc-config.py2
-rw-r--r--build_files/scons/config/win64-vc-config.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py
index 42bf63ed073..9604eb5d320 100644
--- a/build_files/scons/config/win32-vc-config.py
+++ b/build_files/scons/config/win32-vc-config.py
@@ -147,6 +147,8 @@ BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
WITH_BF_3DMOUSE = True
+WITH_BF_OPENMP = True
+
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py
index 69f1e78e3a7..049b7eb5d40 100644
--- a/build_files/scons/config/win64-vc-config.py
+++ b/build_files/scons/config/win64-vc-config.py
@@ -151,6 +151,8 @@ BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
WITH_BF_3DMOUSE = True
+WITH_BF_OPENMP = True
+
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']