OSX: always compile GHOST and Quicktime with Apple-gcc-4.2, simplifies for non-apple...
authorJens Verwiebe <info@jensverwiebe.de>
Wed, 28 Sep 2011 17:15:28 +0000 (17:15 +0000)
committerJens Verwiebe <info@jensverwiebe.de>
Wed, 28 Sep 2011 17:15:28 +0000 (17:15 +0000)
intern/ghost/SConscript
source/blender/quicktime/SConscript

index 7869921ce024875fa0b10d1932da81353fdcce9a..1b8600b6116bfa80cf491d5b3a4ba99da8664f2d 100644 (file)
@@ -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"
 
index d2a42ddf7b38eda743acd4c02556d72fdc35c3f7..6dbba3ea86898960951fe1745410739064e18ead 100644 (file)
@@ -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)