It's no longer needed.
Signed-off-by: Jacek Caban <ja...@codeweavers.com>
---
mingw-w64-headers/Makefile.am | 7 ++-----
mingw-w64-headers/crt/_mingw.h.in | 1 -
mingw-w64-headers/crt/sdks/_mingw_directx.h.in | 16 ----------------
mingw-w64-headers/defaults/generate.sh | 1 -
.../defaults/include/sdks/_mingw_directx.h | 10 ----------
5 files changed, 2 insertions(+), 33 deletions(-)
delete mode 100644 mingw-w64-headers/crt/sdks/_mingw_directx.h.in
delete mode 100644
mingw-w64-headers/defaults/include/sdks/_mingw_directx.h
diff --git a/mingw-w64-headers/Makefile.am b/mingw-w64-headers/Makefile.am
index 20c9c1ce..9a8e3cc0 100644
--- a/mingw-w64-headers/Makefile.am
+++ b/mingw-w64-headers/Makefile.am
@@ -21,8 +21,8 @@ gdiplushead_HEADERS = @GDIPLUSHEAD_LIST@
wrlhead_HEADERS = @WRLHEAD_LIST@
wrlwrappershead_HEADERS = @WRLWRAPPERSHEAD_LIST@
mingwhelperhead_HEADERS = @MINGWHELPERHEAD_LIST@
-nodist_sdkshead_HEADERS = _mingw_directx.h _mingw_ddk.h
-noinst_HEADERS = crt/sdks/_mingw_directx.h.in crt/sdks/_mingw_ddk.h.in
+nodist_sdkshead_HEADERS = _mingw_ddk.h
+noinst_HEADERS = crt/sdks/_mingw_ddk.h.in
ddkheaddir = $(baseheaddir)/ddk
dxheaddir = $(baseheaddir)
@@ -252,8 +252,5 @@ BUILT_SOURCES = $(IDL_SRCS:.idl=.h) $(TLB_SRCS:.idl=.tlb)
endif
-_mingw_directx.h: $(srcdir)/crt/sdks/_mingw_directx.h.in
- $(SED) s/MINGW_HAS_DX$$/@MINGW_HAS_DX@/ $< > $@
-
_mingw_ddk.h: $(srcdir)/crt/sdks/_mingw_ddk.h.in
$(SED) s/MINGW_HAS_DDK$$/@MINGW_HAS_DDK@/ $< > $@
diff --git a/mingw-w64-headers/crt/_mingw.h.in b/mingw-w64-headers/crt/_mingw.h.in
index 88992e07..2be2d181 100644
--- a/mingw-w64-headers/crt/_mingw.h.in
+++ b/mingw-w64-headers/crt/_mingw.h.in
@@ -606,7 +606,6 @@ const char *__mingw_get_crt_info (void);
#define __GOT_SECURE_LIB__ __STDC_SECURE_LIB__
#ifndef __WIDL__
-#include "sdks/_mingw_directx.h"
#include "sdks/_mingw_ddk.h"
#endif
diff --git a/mingw-w64-headers/crt/sdks/_mingw_directx.h.in b/mingw-w64-headers/crt/sdks/_mingw_directx.h.in
deleted file mode 100644
index 1cb42ceb..00000000
--- a/mingw-w64-headers/crt/sdks/_mingw_directx.h.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#if MINGW_HAS_DX
-
-#define __MINGW_HAS_DXSDK 1
-
-#ifndef MINGW_HAS_DDRAW_H
-#define MINGW_HAS_DDRAW_H 1
-#define MINGW_DDRAW_VERSION 7
-#endif
-
-#else
-
-#undef __MINGW_HAS_DXSDK
-#undef MINGW_HAS_DDRAW_H
-#undef MINGW_DDRAW_VERSION
-
-#endif
diff --git a/mingw-w64-headers/defaults/generate.sh b/mingw-w64-headers/defaults/generate.sh
index f1fdada8..b5bd0817 100755
--- a/mingw-w64-headers/defaults/generate.sh
+++ b/mingw-w64-headers/defaults/generate.sh
@@ -1,4 +1,3 @@
#!/bin/sh
-sed s/@MINGW_HAS_DX@/0/ crt/sdks/_mingw_directx.h.in > defaults/include/sdks/_mingw_directx.h
sed s/@MINGW_HAS_DDK@/0/ crt/sdks/_mingw_ddk.h.in > defaults/include/sdks/_mingw_ddk.h
diff --git a/mingw-w64-headers/defaults/include/sdks/_mingw_directx.h b/mingw-w64-headers/defaults/include/sdks/_mingw_directx.h
deleted file mode 100644
index dc814acd..00000000
--- a/mingw-w64-headers/defaults/include/sdks/_mingw_directx.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#if 0
-#ifndef MINGW_HAS_DDRAW_H
-
-#define MINGW_HAS_DDRAW_H 1
-#define MINGW_DDRAW_VERSION 7
-#endif
-#else
-#undef MINGW_HAS_DDRAW_H
-#undef MINGW_DDRAW_VERSION
-#endif
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
