Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2012-11-27 15:38:59 +0400
committerJens Verwiebe <info@jensverwiebe.de>2012-11-27 15:38:59 +0400
commit1fa12f09d5bce2a6ea64050674aefab08c45e63e (patch)
tree35f28c9d132b19d339ff89bb18116b3709512b60 /SConstruct
parentf79c61c1665b9eea828bb3ba6d8d07dfc0939a48 (diff)
OSX/scons: introducing and testing an unexported_symbols_list to prevent clashes, todo: cmake
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct3
1 files changed, 3 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct
index 5a1797ec1dc..d6972de8cab 100644
--- a/SConstruct
+++ b/SConstruct
@@ -312,6 +312,9 @@ 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'])
+ # Trying to get rid of eventually clashes, we export some explicite as local symbols
+ env.Append(LINKFLAGS=['-Xlinker','-unexported_symbols_list','-Xlinker','./source/creator/osx_locals.map'])
+
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env['CCFLAGS'].append('/openmp')