Mercurial > hg > orthanc-stone
view Resources/CMake/PixmanConfiguration.patch @ 1316:7045a0ff32c4 broker
Added DISABLE_STONE_QT_CMAKE_FILE option (Qt5 Win10 builds do not work when QtConfiguration.cmake is included). This is a quick hacky fix.
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Mon, 16 Mar 2020 11:21:57 +0100 |
parents | 351ab0da0150 |
children |
line wrap: on
line source
diff -urEb pixman-0.34.0.orig/pixman/pixman-x86.c pixman-0.34.0/pixman/pixman-x86.c --- pixman-0.34.0.orig/pixman/pixman-x86.c 2016-07-05 12:46:52.889101224 +0200 +++ pixman-0.34.0/pixman/pixman-x86.c 2016-07-05 12:47:07.253101808 +0200 @@ -80,7 +80,7 @@ static pixman_bool_t have_cpuid (void) { -#if _PIXMAN_X86_64 || defined (_MSC_VER) +#if _PIXMAN_X86_64 || defined (_MSC_VER) || defined(__native_client__) return TRUE; Only in pixman-0.34.0/pixman: pixman-x86.c~