diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2011-09-28 21:28:37 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2011-09-28 21:28:37 +0400 |
| commit | 6088d460efd48728cb3fc58254557766b79ef6d4 (patch) | |
| tree | a49ce486e3de6f119f6f19c16e0d74b99c1e7943 | |
| parent | eb2c89ab875cc90c7ed9e62b1d5e786cb42493a1 (diff) | |
OSX: Give clear commenting and more up-to-date defaults
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 5 | ||||
| -rw-r--r-- | intern/ghost/SConscript | 4 | ||||
| -rw-r--r-- | source/blender/quicktime/SConscript | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 5d0c046ed05..ba0ece6d47e 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -90,9 +90,10 @@ LIBDIR = '${LCGDIR}' ################### Dependency settings ################## ############################################################################# -#Defaults openMP to true if compiler handles it +#Defaults openMP to true if compiler handles it ( only gcc 4.6.1 and newer ) +# if your compiler don´t has accurate suffix you may have to enable it by hand ! if CC.endswith('4.6.1'): - WITH_BF_OPENMP = True # multithreading for fluids, cloth and smoke + WITH_BF_OPENMP = True # multithreading for fluids, cloth, sculpt and smoke else: WITH_BF_OPENMP = False diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 1b8600b6116..ff4703976a1 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -102,8 +102,8 @@ if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-v if window_system in ('win32-vc', 'win64-vc'): env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15]) #, cc_compileflags=env['CCFLAGS'].append('/WX') ) -elif env['OURPLATFORM'] == 'darwin': # compile ghost always with apple-gcc to keep objectiveC compatibility - env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/gcc-4.2' ) #, cc_compileflags=env['CXXFLAGS'].append('-fobjc-exceptions') +elif env['OURPLATFORM'] == 'darwin': # always use Apple-gcc-4.2 for objC language, for gnu-compilers don´t support it fully yet + env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/gcc-4.2' ) print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC" else: diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript index 6dbba3ea868..d80a414898f 100644 --- a/source/blender/quicktime/SConscript +++ b/source/blender/quicktime/SConscript @@ -35,6 +35,6 @@ defs=['WITH_QUICKTIME'] if env['WITH_GHOST_COCOA']: defs.append('GHOST_COCOA') - env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities, cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/gcc-4.2') + env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities, cc_compilerchange='/usr/bin/gcc-4.2', cxx_compilerchange='/usr/bin/gcc-4.2') # always use Apple-gcc-4.2 for objC language, for gnu-compilers don´t support it fully yet else: env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities) |