Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

directxtex: Fix MinGW64 build.

  • Loading branch information...
commit dc993d935966d1c48b3fa03e17339ee891d7f734 1 parent c8695f7
@jrfonseca jrfonseca authored
Showing with 8 additions and 1 deletion.
  1. +8 −1 thirdparty/directxtex/CMakeLists.txt
View
9 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 ()
Please sign in to comment.
Something went wrong with that request. Please try again.