diff options
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/cycles/SConscript | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 75e8b24452c..4e1a18adbf3 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -90,6 +90,7 @@ include_directories( ${BOOST_INCLUDE_DIR} ${OPENIMAGEIO_INCLUDE_DIRS} ${OPENIMAGEIO_INCLUDE_DIRS}/OpenImageIO + ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIRS}) # Subdirectories diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript index 2b97d54dc08..efd4a88c80c 100644 --- a/intern/cycles/SConscript +++ b/intern/cycles/SConscript @@ -103,7 +103,7 @@ optim_defs = defs[:] cycles_avx = cycles.Clone() avx_sources = [path.join('kernel', 'kernel_avx.cpp')] if env['OURPLATFORM'] == 'darwin': # always use Apple assembler for avx , gnu-compilers do not support it ( vanilla gcc-4.6 or higher case ) - cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags, cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++') + cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags) else: cycles_avx.BlenderLib('bf_intern_cycles_avx', avx_sources, incs, optim_defs, libtype=['intern'], priority=[10], cxx_compileflags=avx_cxxflags) |