Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2017-08-15 00:11:05 +0300
committerRay Molenkamp <github@lazydodo.com>2017-08-15 00:11:05 +0300
commit30e010081334e3db0f6fe9f264e2801ef6d9cfe9 (patch)
tree0384c78f75b87f1d4c69262419fd66429e342730 /build_files/build_environment/cmake/osl.cmake
parent86eb8980d3609e5783b1253599d2d7badbdd3930 (diff)
[depsbuilder] Fix broken osl flags on windows.
Diffstat (limited to 'build_files/build_environment/cmake/osl.cmake')
-rw-r--r--build_files/build_environment/cmake/osl.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/build_environment/cmake/osl.cmake b/build_files/build_environment/cmake/osl.cmake
index 97b86c39baa..5ddb981c604 100644
--- a/build_files/build_environment/cmake/osl.cmake
+++ b/build_files/build_environment/cmake/osl.cmake
@@ -21,9 +21,9 @@ if(WIN32)
set(OSL_FLEX_BISON -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe -DFLEX_EXTRA_OPTIONS="--wincompat" -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe)
set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/libpng16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}")
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
- set(OSL_SIMD_FLAGS -DOIIO_SIMD=0)
+ set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=0)
else()
- set(OSL_SIMD_FLAGS -DOIIO_SIMD=sse2)
+ set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
endif()
else()
set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)