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-16 01:35:25 +0400
committerJens Verwiebe <info@jensverwiebe.de>2012-11-16 01:35:25 +0400
commit69320ea5954696ccf80eef33ecfe2dda88f579f0 (patch)
tree505370a8beab842ae704c881d62e0840290e70b3 /SConstruct
parent7e97cd4b49b2ec639ab92083c23a73fbbfedeb43 (diff)
OSX/scons/osl: initial osl compiling, todo: fix shader compile and copy to bundle
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct3
1 files changed, 3 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct
index 0bbe06eb21e..01e83a7bacc 100644
--- a/SConstruct
+++ b/SConstruct
@@ -306,6 +306,9 @@ if env['OURPLATFORM']=='darwin':
else:
env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','Jackmp'])
+ if env['WITH_BF_CYCLES_OSL'] == 1:
+ env.Append(LINKFLAGS=['-force_load','../lib/darwin-9.x.universal/osl/lib/liboslexec.a'])
+
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env['CCFLAGS'].append('/openmp')