bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jens Verwiebe 2011-09-28 11:56:50 +00:00
parent c8b0d25794
commit d0e7be242b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -277,7 +277,7 @@ if env['OURPLATFORM']=='darwin':
print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors ! print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
env['WITH_BF_3DMOUSE'] = 0 env['WITH_BF_3DMOUSE'] = 0
else: else:
env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient']) env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
if env['WITH_BF_OPENMP'] == 1: if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):

6
source/blender/quicktime/SConscript
View File

@ -35,5 +35,7 @@ defs=['WITH_QUICKTIME']
if env['WITH_GHOST_COCOA']: if env['WITH_GHOST_COCOA']:
defs.append('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) 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)