diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-16 04:43:28 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-16 04:43:28 +0400 |
| commit | 4ece50723bf82af2dedf99f41d761827e668ad7e (patch) | |
| tree | 12c2cbccafa6b7bda0b3e9b48c68f34860ebf7c6 /intern | |
| parent | b3f6c1213697b152c14837f280b469af9c499651 (diff) | |
OSX/scons/osl: ready for compile now, little hack to be resolved, todo:fix a crash with shadercompile
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/shaders/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/SConscript b/intern/cycles/kernel/shaders/SConscript index 924aff4fc22..1d446205d92 100644 --- a/intern/cycles/kernel/shaders/SConscript +++ b/intern/cycles/kernel/shaders/SConscript @@ -14,7 +14,10 @@ if env['WITH_BF_CYCLES_OSL']: shaders = env.Clone() # 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 root_build_dir = normpath(env['BF_BUILDDIR']) |