summaryrefslogtreecommitdiff
path: root/thirdparty/directxtex
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2016-02-25 21:37:42 +0000
committerJose Fonseca <jfonseca@vmware.com>2016-02-25 21:37:42 +0000
commit71a85c9d1c585630bb8742510712cfbde3a9b49d (patch)
treeb42c041fefc8ae98e12d26b0d703ff8a17128196 /thirdparty/directxtex
parentd43e5602acfca75b26146f92c8eace522d8a044d (diff)
compat: Create a new top-level directory for compatibility headers.
Diffstat (limited to 'thirdparty/directxtex')
-rw-r--r--thirdparty/directxtex/CMakeLists.txt3
-rw-r--r--thirdparty/directxtex/mingw/tweaks.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/thirdparty/directxtex/CMakeLists.txt b/thirdparty/directxtex/CMakeLists.txt
index 6ed1d7e5..79f0b235 100644
--- a/thirdparty/directxtex/CMakeLists.txt
+++ b/thirdparty/directxtex/CMakeLists.txt
@@ -21,9 +21,6 @@ if (DirectX_D3D11_INCLUDE_FOUND)
${CMAKE_SOURCE_DIR}/thirdparty/mingw/wrl
)
- include_directories (BEFORE
- ${CMAKE_SOURCE_DIR}/dispatch # for compat.h
- )
add_definitions (
#inhibit warnings
-w
diff --git a/thirdparty/directxtex/mingw/tweaks.h b/thirdparty/directxtex/mingw/tweaks.h
index a8d0d536..3c26e9b7 100644
--- a/thirdparty/directxtex/mingw/tweaks.h
+++ b/thirdparty/directxtex/mingw/tweaks.h
@@ -41,7 +41,7 @@
#define memcpy_s(dest, numberOfElements, src, count) memcpy(dest, src, count)
-#include "compat.h"
+#include "winsdk_compat.h"
#ifndef ERROR_FILE_TOO_LARGE