diff options
author | Jens Verwiebe <info@jensverwiebe.de> | 2011-09-28 21:15:28 +0400 |
---|---|---|
committer | Jens Verwiebe <info@jensverwiebe.de> | 2011-09-28 21:15:28 +0400 |
commit | 416885aad44b0b0e3577f8f8f28c75ee5f669263 (patch) | |
tree | 69cb5ce799fd0867a234ddb4919d3d2fb9b9caea | |
parent | bee8e456f6da9d08ab2a1caa6cf452b9c2a95d36 (diff) |
OSX: always compile GHOST and Quicktime with Apple-gcc-4.2, simplifies for non-apple compilers
-rw-r--r-- | intern/ghost/SConscript | 2 | ||||
-rw-r--r-- | source/blender/quicktime/SConscript | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 7869921ce02..1b8600b6116 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -102,7 +102,7 @@ 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' and env['CC'].endswith('4.6.1'): # compile ghost always with apple-gcc to keep objectiveC compatibility +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') print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC" diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript index d2a42ddf7b3..6dbba3ea868 100644 --- a/source/blender/quicktime/SConscript +++ b/source/blender/quicktime/SConscript @@ -35,7 +35,6 @@ defs=['WITH_QUICKTIME'] if env['WITH_GHOST_COCOA']: defs.append('GHOST_COCOA') -if env['WITH_GHOST_COCOA'] and env['CC'].endswith('4.6.1'): 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') else: env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities) |