diff options
| -rw-r--r-- | SConstruct | 9 | ||||
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index 3ffd3f42b32..c4079341df9 100644 --- a/SConstruct +++ b/SConstruct @@ -410,10 +410,11 @@ if env['OURPLATFORM']=='darwin': #Defaults openMP to true if compiler handles it ( only gcc 4.6.1 and newer ) # if your compiler does not have accurate suffix you may have to enable it by hand ! - if env['CC'][:-2].endswith('4.6') or env['CC'][:-2].endswith('4.8'): - env['WITH_BF_OPENMP'] = 1 # multithreading for fluids, cloth, sculpt and smoke - else: - env['WITH_BF_OPENMP'] = 0 + if env['WITH_BF_OPENMP'] == 1: + if env['CC'][:-2].endswith('4.6') or env['CC'][:-2].endswith('4.8'): + env['WITH_BF_OPENMP'] = 1 # multithreading for fluids, cloth, sculpt and smoke + else: + env['WITH_BF_OPENMP'] = 0 env['PLATFORM_LINKFLAGS'] = env['PLATFORM_LINKFLAGS']+ARCH_FLAGS diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 2d658fcb756..0b0120e4473 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -211,6 +211,9 @@ BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35'] #Freestyle WITH_BF_FREESTYLE = True +#OpenMP ( will be checked for compiler support and turned off eventually ) +WITH_BF_OPENMP = True + #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = [] |