[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40665] trunk/blender: OSX: always compile GHOST and Quicktime with Apple-gcc-4.2, simplifies for non-apple compilers

[jens verwiebe]

Revision: 40665
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40665
Author:   jensverwiebe
Date:     2011-09-28 17:15:28 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
OSX: always compile GHOST and Quicktime with Apple-gcc-4.2, simplifies for non-apple compilers

Modified Paths:
--------------
    trunk/blender/intern/ghost/SConscript
    trunk/blender/source/blender/quicktime/SConscript

Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript	2011-09-28 16:46:16 UTC (rev 40664)
+++ trunk/blender/intern/ghost/SConscript	2011-09-28 17:15:28 UTC (rev 40665)
@@ -102,7 +102,7 @@
 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"
 

Modified: trunk/blender/source/blender/quicktime/SConscript
===================================================================
--- trunk/blender/source/blender/quicktime/SConscript	2011-09-28 16:46:16 UTC (rev 40664)
+++ trunk/blender/source/blender/quicktime/SConscript	2011-09-28 17:15:28 UTC (rev 40665)
@@ -35,7 +35,6 @@
 
 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)