From a9c8a117a267e1feec7471309107c8ef67dc5dc3 Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Tue, 29 Jul 2014 10:59:57 +0200 Subject: OSX/scons: Fix linking if llvm is not used ( new osl/llvm/oiio related ) --- SConstruct | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 331158e89d2..91ade7ec0cd 100644 --- a/SConstruct +++ b/SConstruct @@ -438,6 +438,10 @@ if env['OURPLATFORM']=='darwin': env.Append(LINKFLAGS=['-L'+OSX_OSL_LIBPATH,'-loslcomp','-force_load '+ OSX_OSL_LIBPATH +'/liboslexec.a','-loslquery']) env.Append(BF_PROGRAM_LINKFLAGS=['-Xlinker','-force_load','-Xlinker',OSX_OSL_LIBPATH +'/liboslexec.a']) + if env['WITH_BF_LLVM'] == 0: + # Due duplicated generic UTF functions, we pull them either from LLVMSupport or COLLADA + env.Append(BF_OPENCOLLADA_LIB=' UTF') + # Trying to get rid of eventually clashes, we export some symbols explicite as local env.Append(LINKFLAGS=['-Xlinker','-unexported_symbols_list','-Xlinker','./source/creator/osx_locals.map']) -- cgit v1.2.3