From dc993d935966d1c48b3fa03e17339ee891d7f734 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Wed, 6 Mar 2013 14:09:48 +0000 Subject: [PATCH] directxtex: Fix MinGW64 build. --- thirdparty/directxtex/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/thirdparty/directxtex/CMakeLists.txt b/thirdparty/directxtex/CMakeLists.txt index 1426640..1ce5c1c 100644 --- a/thirdparty/directxtex/CMakeLists.txt +++ b/thirdparty/directxtex/CMakeLists.txt @@ -23,11 +23,18 @@ if (DirectX_D3D11_INCLUDE_DIR) -std=c++0x # static_assert, nullptr unique_ptr -w #inhibit warnings + # workaround http://sourceforge.net/tracker/index.php?func=detail&aid=3067012&group_id=202880&atid=983354 + --include malloc.h + -D_XM_NO_INTRINSICS_ - -D_XM_X86_ -DXMINLINE=inline -DXM_NO_ALIGNMENT ) + if (CMAKE_SIZEOF_VOID_P EQUAL 8) + add_definitions (-D_XM_X64_) + else () + add_definitions (-D_XM_X86_) + endif () set (MINGW_GUID mingw/guid.cpp) endif () -- 2.43.0