X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=thirdparty%2Fdirectxtex%2FCMakeLists.txt;h=1ce5c1c502a96b1126c198ab5c92a0af3ef2618e;hb=dc993d935966d1c48b3fa03e17339ee891d7f734;hp=142664040275def30f4307576a299ac6655fbdc4;hpb=c8695f74ce1ee6a93dee4b3f7da5a70a64706c82;p=apitrace

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 ()