Commit: a9c8a117a267e1feec7471309107c8ef67dc5dc3
Author: Jens Verwiebe
Date: Tue Jul 29 10:59:57 2014 +0200
Branches: master
https://developer.blender.org/rBa9c8a117a267e1feec7471309107c8ef67dc5dc3
OSX/scons: Fix linking if llvm is not used ( new osl/llvm/oiio related )
===================================================================
M SConstruct
===================================================================
diff --git a/SConstruct b/SConstruct
index 331158e..91ade7e 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'])
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
