Skip to content

Commit 880d771

Browse files
Morris Hafnerbashbaug
authored andcommitted
Downstream MinGW fixes
* Don't include DX SDK at all on MinGW (MinGW have their own headers) * Lower case header name for cross-compilation on Linux
1 parent 7d2584c commit 880d771

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if (WIN32)
4646
# Only add the DXSDK include directory if the environment variable is
4747
# defined. Since the DXSDK has merged into the Windows SDK, this is
4848
# only required in rare cases.
49-
if (DEFINED ENV{DXSDK_DIR})
49+
if (DEFINED ENV{DXSDK_DIR} AND NOT (MINGW OR MSYS OR CYGWIN))
5050
include_directories ($ENV{DXSDK_DIR}/Include)
5151
endif ()
5252
else ()

loader/windows/icd_windows_hkr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <assert.h>
2424
#include <stdbool.h>
2525
#include <initguid.h>
26-
#include <Devpkey.h>
26+
#include <devpkey.h>
2727
#include <devguid.h>
2828

2929
// This GUID was only added to devguid.h on Windows SDK v10.0.16232 which

0 commit comments

Comments
 (0)