Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OSX/scons/osl: ready for compile now, little hack to be resolved, todo:fix a crash with shadercompile

Browse Source
This commit is contained in:
Jens Verwiebe
2012-11-16 00:43:28 +00:00
parent b3f6c12136
commit 4ece50723b
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build_files/scons/tools/Blender.py
View File

@@ -652,6 +652,14 @@ def AppIt(target=None, source=None, env=None):
cmd = 'cp -R %s/../intern/cycles/kernel/*.cubin %s/lib/' % (builddir, cinstalldir) cmd = 'cp -R %s/../intern/cycles/kernel/*.cubin %s/lib/' % (builddir, cinstalldir)
commands.getoutput(cmd) 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']: if env['WITH_OSX_STATICPYTHON']:
cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION) cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION)
commands.getoutput(cmd) commands.getoutput(cmd)

5
intern/cycles/kernel/shaders/SConscript
View File

@@ -14,7 +14,10 @@ if env['WITH_BF_CYCLES_OSL']:
shaders = env.Clone() shaders = env.Clone()
# osl compiler info # osl compiler info
osl_compiler = env['BF_OSL_COMPILER'] if env['OURPLATFORM']=='darwin':
osl_compiler = '../lib/darwin-9.x.universal/osl/bin/oslc' # temporary hack to get the leading "#" away that breaks shadercompile
else:
osl_compiler = env['BF_OSL_COMPILER']
# build directory # build directory
root_build_dir = normpath(env['BF_BUILDDIR']) root_build_dir = normpath(env['BF_BUILDDIR'])