From fbb15a3b322727370ed1d52ef4e2b28ffed8ddae Mon Sep 17 00:00:00 2001 From: Ryan Spicer Date: Sun, 27 Oct 2013 20:43:13 -0700 Subject: Fix MSVC2012 build. 1) Look for Windows Kit (Platform SDK) -- provides opengl3 for QT5. 2) Specify link with SAFESEH:NO if using MSVC2012, since older directinput lib (dx8?) fails to link with this enabled. --- CMakeLists.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 58fbfc60..76a917a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,27 @@ if(SDK_GOOGLE_BREAKPAD AND WIN32) include_directories("${SDK_GOOGLE_BREAKPAD}/src/") endif() +if (WIN32 AND DEFINED MSVC_VERSION AND NOT ${MSVC_VERSION} LESS 1700) + find_path (WIN8_SDK_ROOT_DIR + Include/um/windows.h + PATHS + "$ENV{ProgramFiles}/Windows Kits/8.0" + "$ENV{ProgramFiles(x86)}/Windows Kits/8.0" + DOC "Windows 8 SDK root directory" + ) + + if (WIN8_SDK_ROOT_DIR) + SET(CMAKE_LIBRARY_PATH "${WIN8_SDK_ROOT_DIR}/Lib/win8/um/x86") + endif () + endif () +endif() + +if(WIN32 AND DEFINED MSVC_VERSION AND NOT ${MSVC_VERSION} LESS 1700) + SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") + SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") + SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO") +endif() + if(UNIX) set(SDK_ENABLE_LIBEVDEV FALSE CACHE BOOL "libevdev virtual joystick protocol support (probably Linux only)") endif() -- cgit v1.2.3