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 04:43:28 +0400
committerJens Verwiebe <info@jensverwiebe.de>2012-11-16 04:43:28 +0400
commit4ece50723bf82af2dedf99f41d761827e668ad7e (patch)
tree12c2cbccafa6b7bda0b3e9b48c68f34860ebf7c6 /build_files/scons
parentb3f6c1213697b152c14837f280b469af9c499651 (diff)
OSX/scons/osl: ready for compile now, little hack to be resolved, todo:fix a crash with shadercompile
Diffstat (limited to 'build_files/scons')
-rw-r--r--build_files/scons/tools/Blender.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index 23e732370ce..27e8feaea80 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -652,6 +652,14 @@ def AppIt(target=None, source=None, env=None):
cmd = 'cp -R %s/../intern/cycles/kernel/*.cubin %s/lib/' % (builddir, cinstalldir)
commands.getoutput(cmd)
+ if env['WITH_BF_CYCLES_OSL']:
+ cmd = 'mkdir %s/shader' % (cinstalldir)
+ commands.getoutput(cmd)
+ cmd = 'cp -R %s/kernel/shaders/*.h %s/shader' % (croot, cinstalldir)
+ commands.getoutput(cmd)
+ cmd = 'cp -R %s/../intern/cycles/kernel/shaders/*.oso %s/shader' % (builddir, cinstalldir)
+ commands.getoutput(cmd)
+
if env['WITH_OSX_STATICPYTHON']:
cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION)
commands.getoutput(cmd)