From 6b8f937894941fc38ed7da4d4a489a307bd8444c Mon Sep 17 00:00:00 2001 From: whitequark <whitequark@whitequark.org> Date: Tue, 3 Jan 2017 00:52:24 +0000 Subject: [PATCH] Win32: fix compatibility with MSVC x64 builds. --- CMakeLists.txt | 2 +- extlib/pixman | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e82c33..01a4ee2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,7 +153,7 @@ if(WIN32) find_package(OpenGL REQUIRED) endif() - if(NOT MINGW) + if(MSVC AND ${CMAKE_SIZEOF_VOID_P} EQUAL 4) message(STATUS "Using prebuilt SpaceWare") set(SPACEWARE_FOUND TRUE) set(SPACEWARE_INCLUDE_DIR diff --git a/extlib/pixman b/extlib/pixman index 54eee47..5561dfc 160000 --- a/extlib/pixman +++ b/extlib/pixman @@ -1 +1 @@ -Subproject commit 54eee47843a147336c594b3213993b439fdf67ed +Subproject commit 5561dfc3f7e992454076ff3f10a0554c6b407e19