diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-11-15 20:34:22 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-11-15 20:34:22 +0400 |
| commit | 1c9b548d92e8a76ac0a3c730bff5634d4628e971 (patch) | |
| tree | 114160c7306dc68d57fd5de6374f7f3a05274e10 | |
| parent | 5c6f6301b02a68c6569e14a70b3968a69fa099e7 (diff) | |
Windows / Scons OSL:
* Initial support, still commented.
| -rw-r--r-- | build_files/scons/config/win32-vc-config.py | 13 | ||||
| -rw-r--r-- | build_files/scons/config/win64-vc-config.py | 13 | ||||
| -rw-r--r-- | intern/cycles/kernel/shaders/SConscript | 2 |
3 files changed, 27 insertions, 1 deletions
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index a2b76bbed88..be30053c314 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -150,6 +150,19 @@ WITH_BF_OPENMP = True #Cycles WITH_BF_CYCLES = True +#OSL +''' +WITH_BF_CYCLES_OSL = True +WITH_BF_STATICOSL = True +BF_OSL = LIBDIR + '/osl' +BF_OSL_INC = '${BF_OSL}/include' +# note oslexec would passed via program linkflags, which is needed to +# make llvm happy with osl_allocate_closure_component +BF_OSL_LIB = 'oslcomp oslexec oslquery' +BF_OSL_LIBPATH = '${BF_OSL}/lib' +BF_OSL_COMPILER = '${BF_OSL}/bin/oslc' +''' + WITH_BF_OIIO = True BF_OIIO = '${LIBDIR}/openimageio' BF_OIIO_INC = '${BF_OIIO}/include' diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index a0c37f0b73f..8d49e178ddb 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -146,6 +146,19 @@ WITH_BF_OPENMP = True #Cycles WITH_BF_CYCLES = True +#OSL +''' +WITH_BF_CYCLES_OSL = True +WITH_BF_STATICOSL = True +BF_OSL = LIBDIR + '/osl' +BF_OSL_INC = '${BF_OSL}/include' +# note oslexec would passed via program linkflags, which is needed to +# make llvm happy with osl_allocate_closure_component +BF_OSL_LIB = 'oslcomp oslexec oslquery' +BF_OSL_LIBPATH = '${BF_OSL}/lib' +BF_OSL_COMPILER = '${BF_OSL}/bin/oslc' +''' + WITH_BF_OIIO = True BF_OIIO = '${LIBDIR}/openimageio' BF_OIIO_INC = '${BF_OIIO}/include' diff --git a/intern/cycles/kernel/shaders/SConscript b/intern/cycles/kernel/shaders/SConscript index 8dfd5a304f3..924aff4fc22 100644 --- a/intern/cycles/kernel/shaders/SConscript +++ b/intern/cycles/kernel/shaders/SConscript @@ -13,7 +13,7 @@ oso_files = [] if env['WITH_BF_CYCLES_OSL']: shaders = env.Clone() - # cuda info + # osl compiler info osl_compiler = env['BF_OSL_COMPILER'] # build directory |