OSX/scons: for completeness, added WITH_BF_OPENMP switch
authorJens Verwiebe <info@jensverwiebe.de>
Wed, 6 Nov 2013 23:19:01 +0000 (23:19 +0000)
committerJens Verwiebe <info@jensverwiebe.de>
Wed, 6 Nov 2013 23:19:01 +0000 (23:19 +0000)
SConstruct
build_files/scons/config/darwin-config.py

index 3ffd3f42b32c7762c3129a0e4b145817c4d88911..c4079341df902ad6cb02bb8a9f484661666e14ce 100644 (file)
@@ -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
 
index 2d658fcb7564cec1f7c50aa2dc2cfc95a8f5cf63..0b0120e4473959621b47f8db1daad19716c2e92b 100644 (file)
@@ -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 = []