forked from bartvdbraak/blender
OSX/scons: make another gcc conditional futureproof
This commit is contained in:
parent
a00f0469ca
commit
92f3fa3fcd
@ -416,7 +416,7 @@ if env['OURPLATFORM']=='darwin':
|
|||||||
if env['WITH_BF_CYCLES_OSL'] == 1:
|
if env['WITH_BF_CYCLES_OSL'] == 1:
|
||||||
OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath
|
OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath
|
||||||
# we need 2 variants of passing the oslexec with the force_load option, string and list type atm
|
# we need 2 variants of passing the oslexec with the force_load option, string and list type atm
|
||||||
if env['CC'][:-2].endswith('4.8'):
|
if env['CC'].split('/')[len(env['CC'].split('/'))-1][4:] >= '4.8':
|
||||||
env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-loslexec','-loslquery'])
|
env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-loslexec','-loslquery'])
|
||||||
else:
|
else:
|
||||||
env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-force_load '+ OSX_OSL_LIBPATH +'/liboslexec.a','-loslquery'])
|
env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-force_load '+ OSX_OSL_LIBPATH +'/liboslexec.a','-loslquery'])
|
||||||
|
Loading…
Reference in New Issue
Block a user