OSX: solve weaklinking for non-apple compilers by using Xlinker, build also QTKit...
authorJens Verwiebe <info@jensverwiebe.de>
Wed, 28 Sep 2011 11:56:50 +0000 (11:56 +0000)
committerJens Verwiebe <info@jensverwiebe.de>
Wed, 28 Sep 2011 11:56:50 +0000 (11:56 +0000)
SConstruct
source/blender/quicktime/SConscript

index 42ee334..6de11d8 100644 (file)
@@ -277,7 +277,7 @@ if env['OURPLATFORM']=='darwin':
             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'):
index 24dfab1..d2a42dd 100644 (file)
@@ -35,5 +35,7 @@ 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)
+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)