# HG changeset patch # User Sebastien Jodogne # Date 1479917235 -3600 # Node ID 99b833843ba9df70d9cdd390f667d13db86affc4 # Parent 902e6c52e15491d7d7d6977132d1a6e002c0d605 fix MSVC 64bit builds diff -r 902e6c52e154 -r 99b833843ba9 Resources/CMake/OrthancStone.cmake --- a/Resources/CMake/OrthancStone.cmake Wed Nov 23 15:50:31 2016 +0100 +++ b/Resources/CMake/OrthancStone.cmake Wed Nov 23 17:07:15 2016 +0100 @@ -55,6 +55,11 @@ include(${CMAKE_CURRENT_LIST_DIR}/CairoConfiguration.cmake) include(${CMAKE_CURRENT_LIST_DIR}/PixmanConfiguration.cmake) +if (MSVC) + # Remove some warnings on Visual Studio 2015 + add_definitions(-D_SCL_SECURE_NO_WARNINGS=1) +endif() + ##################################################################### ## Configure optional third-party components diff -r 902e6c52e154 -r 99b833843ba9 Resources/CMake/PixmanConfiguration.cmake --- a/Resources/CMake/PixmanConfiguration.cmake Wed Nov 23 15:50:31 2016 +0100 +++ b/Resources/CMake/PixmanConfiguration.cmake Wed Nov 23 17:07:15 2016 +0100 @@ -102,8 +102,15 @@ ${PIXMAN_SOURCES_DIR}/pixman/pixman-sse2.c ${PIXMAN_SOURCES_DIR}/pixman/pixman-ssse3.c ) + + if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "4") + # Only enable MMX on Windows 32 + add_definitions( + -DUSE_X86_MMX=1 + ) + endif() + add_definitions( - -DUSE_X86_MMX=1 -DUSE_SSE2=1 -DUSE_SSSE3=1 )