diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-19 18:54:35 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-11-19 18:54:35 +0400 |
| commit | 312abf8cb236b72e3e20ce8850da7448897f6aa9 (patch) | |
| tree | ae62f538a94413765afba26d6ba624253148c640 /intern/cycles | |
| parent | 9947f70f19a333b4dba6ed57ae22d93fa0f89145 (diff) | |
SCons: make OSL linking work on windows, and fix OSL compiler path issue to
properly expand to absolute path.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/shaders/SConscript | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/intern/cycles/kernel/shaders/SConscript b/intern/cycles/kernel/shaders/SConscript index 513bef9605a..f1c30395b70 100644 --- a/intern/cycles/kernel/shaders/SConscript +++ b/intern/cycles/kernel/shaders/SConscript @@ -13,11 +13,8 @@ oso_files = [] if env['WITH_BF_CYCLES_OSL']: shaders = env.Clone() - # osl compiler info - if env['OURPLATFORM']=='darwin': - osl_compiler = env['LCGDIR'][1:] + '/osl/bin/oslc' # get the leading "#" away that breaks shadercompile - else: - osl_compiler = env['BF_OSL_COMPILER'] + # osl compiler + osl_compiler = env._canonicalize(env.subst(env['BF_OSL_COMPILER'])) # build directory root_build_dir = normpath(env['BF_BUILDDIR']) |