[Bf-blender-cvs] [30e01008133] master: [depsbuilder] Fix broken osl flags on windows.

Ray Molenkamp noreply at git.blender.org
Mon Aug 14 23:21:56 CEST 2017


Commit: 30e010081334e3db0f6fe9f264e2801ef6d9cfe9
Author: Ray Molenkamp
Date:   Mon Aug 14 15:11:05 2017 -0600
Branches: master
https://developer.blender.org/rB30e010081334e3db0f6fe9f264e2801ef6d9cfe9

[depsbuilder] Fix broken osl flags on windows.

===================================================================

M	build_files/build_environment/cmake/osl.cmake

===================================================================

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)




More information about the Bf-blender-cvs mailing list