diff options
| author | Thomas Dinges <blender@dingto.org> | 2012-11-18 07:56:53 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2012-11-18 07:56:53 +0400 |
| commit | 681081306811c5a00269579c14277e2b747b77a3 (patch) | |
| tree | ab72c14558c0a9c0ad2116fc19127253ccf70fed /build_files | |
| parent | 8cdc141b9a98decb993f09bce276c646d41c59ed (diff) | |
OSL / Windows:
* Some fixes for scons, kernel/osl compiles now.
* Still disabled per default, as relative path to oslc.exe does not work and linking fails.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/win32-vc-config.py | 4 | ||||
| -rw-r--r-- | build_files/scons/config/win64-vc-config.py | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index 74ae186d54b..39031ef27ca 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -151,8 +151,7 @@ WITH_BF_OPENMP = True WITH_BF_CYCLES = True #OSL -''' -WITH_BF_CYCLES_OSL = True +WITH_BF_CYCLES_OSL = False WITH_BF_STATICOSL = True BF_OSL = LIBDIR + '/osl' BF_OSL_INC = '${BF_OSL}/include' @@ -161,7 +160,6 @@ BF_OSL_INC = '${BF_OSL}/include' 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' diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index 86b9984b7e3..2434cb0c63a 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -147,8 +147,7 @@ WITH_BF_OPENMP = True WITH_BF_CYCLES = True #OSL -''' -WITH_BF_CYCLES_OSL = True +WITH_BF_CYCLES_OSL = False WITH_BF_STATICOSL = True BF_OSL = LIBDIR + '/osl' BF_OSL_INC = '${BF_OSL}/include' @@ -157,7 +156,6 @@ BF_OSL_INC = '${BF_OSL}/include' 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' |