[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40654] trunk/blender: OSX: solve weaklinking for non-apple compilers by using Xlinker, build also QTKit with apple gcc, to be more compatible to distributed gnu-gcc compilers without objC, objC++ capabilities

[jens verwiebe]

Revision: 40654
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40654
Author:   jensverwiebe
Date:     2011-09-28 11:56:50 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
OSX: solve weaklinking for non-apple compilers by using Xlinker, build also QTKit with apple gcc, to be more compatible to distributed gnu-gcc compilers without objC, objC++ capabilities

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/source/blender/quicktime/SConscript

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2011-09-28 10:45:39 UTC (rev 40653)
+++ trunk/blender/SConstruct	2011-09-28 11:56:50 UTC (rev 40654)
@@ -277,7 +277,7 @@
             print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
             env['WITH_BF_3DMOUSE'] = 0
         else:
-            env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])
+            env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
 
 if env['WITH_BF_OPENMP'] == 1:
         if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):

Modified: trunk/blender/source/blender/quicktime/SConscript
===================================================================
--- trunk/blender/source/blender/quicktime/SConscript	2011-09-28 10:45:39 UTC (rev 40653)
+++ trunk/blender/source/blender/quicktime/SConscript	2011-09-28 11:56:50 UTC (rev 40654)
@@ -35,5 +35,7 @@
 
 if env['WITH_GHOST_COCOA']:
     defs.append('GHOST_COCOA')
-
-env.BlenderLib ('bf_quicktime', sources=source_files, includes=incs, defines=defs, libtype=types, priority=priorities)
+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)