Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OSX/scons: for completeness, added WITH_BF_OPENMP switch

Browse Source
This commit is contained in:
Jens Verwiebe
2013-11-06 23:19:01 +00:00
parent f07ed3c270
commit ec470d731e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SConstruct
View File

@@ -410,10 +410,11 @@ if env['OURPLATFORM']=='darwin':
#Defaults openMP to true if compiler handles it ( only gcc 4.6.1 and newer ) #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 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'): if env['WITH_BF_OPENMP'] == 1:
env['WITH_BF_OPENMP'] = 1 # multithreading for fluids, cloth, sculpt and smoke if env['CC'][:-2].endswith('4.6') or env['CC'][:-2].endswith('4.8'):
else: env['WITH_BF_OPENMP'] = 1 # multithreading for fluids, cloth, sculpt and smoke
env['WITH_BF_OPENMP'] = 0 else:
env['WITH_BF_OPENMP'] = 0
env['PLATFORM_LINKFLAGS'] = env['PLATFORM_LINKFLAGS']+ARCH_FLAGS env['PLATFORM_LINKFLAGS'] = env['PLATFORM_LINKFLAGS']+ARCH_FLAGS

3
build_files/scons/config/darwin-config.py
View File

@@ -211,6 +211,9 @@ BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
#Freestyle #Freestyle
WITH_BF_FREESTYLE = True WITH_BF_FREESTYLE = True
#OpenMP ( will be checked for compiler support and turned off eventually )
WITH_BF_OPENMP = True
#Ray trace optimization #Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = [] BF_RAYOPTIMIZATION_SSE_FLAGS = []