diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-16 01:35:25 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-16 01:35:25 +0400 |
| commit | 69320ea5954696ccf80eef33ecfe2dda88f579f0 (patch) | |
| tree | 505370a8beab842ae704c881d62e0840290e70b3 /intern/cycles | |
| parent | 7e97cd4b49b2ec639ab92083c23a73fbbfedeb43 (diff) | |
OSX/scons/osl: initial osl compiling, todo: fix shader compile and copy to bundle
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/SConscript | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/osl/SConscript | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 9a4df809732..1a127e364fe 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -36,6 +36,7 @@ incs.extend('#source/blender/blenloader ../../source/blender/makesrna/intern'.sp incs.extend('#extern/glew/include #intern/mikktspace'.split()) incs.append(cycles['BF_OIIO_INC']) incs.append(cycles['BF_BOOST_INC']) +incs.append(cycles['BF_OPENEXR_INC'].split()) incs.extend(cycles['BF_PYTHON_INC'].split()) if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): diff --git a/intern/cycles/kernel/osl/SConscript b/intern/cycles/kernel/osl/SConscript index a66d2447720..2060422ba13 100644 --- a/intern/cycles/kernel/osl/SConscript +++ b/intern/cycles/kernel/osl/SConscript @@ -10,6 +10,7 @@ incs = '. .. ../svm ../../render ../../util ../../device' incs += ' ' + env['BF_OIIO_INC'] incs += ' ' + env['BF_BOOST_INC'] incs += ' ' + env['BF_OSL_INC'] +incs += ' ' + env['BF_OPENEXR_INC'] defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {') defs.append('CCL_NAMESPACE_END=}') |