diff options
| author | Damien Plisson <damien.plisson@yahoo.fr> | 2010-01-30 22:07:48 +0300 |
|---|---|---|
| committer | Damien Plisson <damien.plisson@yahoo.fr> | 2010-01-30 22:07:48 +0300 |
| commit | 62ebf87d8502f996b7ddfcc7e3bb63bd3b66edbf (patch) | |
| tree | 86ab61442b2795b7b4375f596ba1b2d8f1d3bf02 /config | |
| parent | e1700aa6c94d34b6e96571506207d660686d6003 (diff) | |
OSX : update build scripts for updated openCollada libs + ray tracing optimization option in cmake
OpenCollada new version (721) lib has additional lib files to link with.
Added BF_RAY_OPTIMIZATION option in CMake (as the one in scons) for building SIMD optimized ray tracing code.
Diffstat (limited to 'config')
| -rw-r--r-- | config/darwin-config.py | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py index 53b75d455bf..4b2d39f60fb 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -73,6 +73,12 @@ LIBDIR = '${LCGDIR}' ################### Dependency settings ################## ############################################################################# +#Defaults openMP to true if compiler (currently only gcc 4.2) handles it +if CC == 'gcc-4.2': + WITH_BF_OPENMP = True # multithreading for fluids, cloth and smoke +else: + WITH_BF_OPENMP = False + # enable ffmpeg support WITH_BF_FFMPEG = True # -DWITH_FFMPEG FFMPEG_PRECOMPILED = True @@ -120,8 +126,6 @@ else: BF_PYTHON_LINKFLAGS = ['-u', '__dummy']+BF_PYTHON_LINKFLAGS -WITH_BF_OPENMP = '0' # multithreading for fluids, cloth and smoke ( only works with ICC atm ) - WITH_BF_OPENAL = True #different lib must be used following version of gcc # for gcc 3.3 @@ -264,17 +268,20 @@ BF_COLLADA_INC = '${BF_COLLADA}' BF_COLLADA_LIB = 'bf_collada' BF_OPENCOLLADA = LIBDIR + '/opencollada' BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include' -BF_OPENCOLLADA_LIB = 'OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2' +BF_OPENCOLLADA_LIB = 'OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 buffer ftoa' BF_OPENCOLLADA_LIBPATH = LIBDIR + '/opencollada' BF_PCRE = LIBDIR + '/opencollada' BF_PCRE_LIB = 'pcre' -BF_PCRE_LIBPATH = '${BF_PCRE}/lib' +#BF_PCRE_LIBPATH = '${BF_PCRE}/lib' #use OSX dynlib version of pcre #BF_EXPAT = '/usr' #BF_EXPAT_LIB = 'expat' #BF_EXPAT_LIBPATH = '/usr/lib' #Ray trace optimization -WITH_BF_RAYOPTIMIZATION = False +if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386': + WITH_BF_RAYOPTIMIZATION = True +else: + WITH_BF_RAYOPTIMIZATION = False if MACOSX_ARCHITECTURE == 'i386': BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse'] elif MACOSX_ARCHITECTURE == 'x86_64': @@ -340,15 +347,9 @@ if MACOSX_ARCHITECTURE == 'x86_64': REL_CFLAGS = REL_CFLAGS+['-mssse3'] REL_CCFLAGS = REL_CCFLAGS+['-mssse3'] -##BF_DEPEND = True -## -##AR = ar -##ARFLAGS = ruv -##ARFLAGSQUIET = ru -## -#C_WARN = ['-Wdeclaration-after-statement'] - CC_WARN = ['-Wall'] +C_WARN = ['-Wno-char-subscripts', '-Wpointer-arith', '-Wcast-align', '-Wdeclaration-after-statement', '-Wno-unknown-pragmas'] +CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare'] ##FIX_STUBS_WARNINGS = -Wno-unused |