Let's try this again. This time the proposed patch is attached which
may help. For 'ease of review,' this patch does not include the
'generated' makefile.in files.
The problem I am trying to fix is that when building mingw-w64, the
compiler will often use headers from the Tools Directories instead of
the mingw-w64 source directory. This is due to the fact that while some
mingw-w64 SourceDir paths are passed to the compiler, several are not.
This causes 3 problems:
1) In order for me to make and test changes to intrin.h (for example), I
have to remember to copy it to ToolsDir after every change.
2) Users who want to build mingw-w64 have to *know* that they need to
copy certain files (from a variety of locations) to their ToolsDir
before trying to build mingw-w64. While the build may succeed without
this, the results will be uncertain.
3) Header files that are in ToolsDir are usually treated as 'System
Headers' (https://gcc.gnu.org/onlinedocs/cpp/System-Headers.html). Among
other things, this means that warnings in these files tend to get
suppressed rather than found and fixed.
While there are multiple ways to fix this, I have chosen to add the
necessary paths to Makefile.am. I also needed to duplicate 2 files
(_mingw_directx.h _mingw_ddk.h) into appropriately named directories so
that _mingw.h's #include "sdks/_mingw_directx.h" would work (Is there a
better way to resolve this? I can't just generate them into the sdks
directory, since 'distribution' needs them where they are.).
Kai has suggested that we modify the configure script to copy all the
header files to a single directory (a la 'make install') and use that
single directory instead of the 9 above. My scripting skills are not
sufficient to do this. If this is how we want to proceed, someone else
will need to write it.
dw
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 886fcf0..67ac481 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -11,6 +11,9 @@
#AUTOMAKE_OPTIONS = color-tests
+extra_include2=-I$(top_srcdir)/../mingw-w64-headers/include -I$(top_srcdir)/../mingw-w64-headers/crt -I../mingw-w64-headers/crt
+extra_includeDX=-I$(top_srcdir)/../mingw-w64-headers/direct-x/include
+
if WITHSYSROOT
sysincludes=-I@TARGET_SYSTEM_ROOT@/include
withsys=--with-sysroot=@TARGET_SYSTEM_ROOT@
@@ -19,7 +22,7 @@ else
withsys=
endif
-AM_CPPFLAGS=-D_CRTBLD $(sysincludes)
+AM_CPPFLAGS=-D_CRTBLD $(extra_include2) $(sysincludes)
AM_CFLAGS=-pipe -std=gnu99 -D_WIN32_WINNT=0x0f00 @ADD_C_CXX_WARNING_FLAGS@ @ADD_C_ONLY_WARNING_FLAGS@
AM_CXXFLAGS=@ADD_C_CXX_WARNING_FLAGS@ @ADD_CXX_ONLY_WARNING_FLAGS@
CPPFLAGSARM32=-mfpu=vfp
@@ -422,7 +425,7 @@ else
crt32_DATA =
endif
-COMPILE32=$(COMPILE) $(CPPFLAGS32) $(extra_include) -D_SYSCRT=1 -DCRTDLL=1
+COMPILE32=$(COMPILE) $(CPPFLAGS32) $(extra_include) $(extra_include2) -D_SYSCRT=1 -DCRTDLL=1
lib32/crt1.o: crt/crtexe.c
$(COMPILE32) -c $< -o $@ -D__CRTDLL__ -U__MSVCRT__
lib32/crt2.o: crt/crtexe.c
@@ -463,111 +466,111 @@ if !W32API
lib32_LIBRARIES += lib32/libmsvcrt.a
lib32_libmsvcrt_a_SOURCES = $(src_msvcrt32) lib32/msvcrt.def.in
lib32_libmsvcrt_a_AR = $(DTDEF32) lib32/msvcrt.def && $(AR) $(ARFLAGS)
-lib32_libmsvcrt_a_CPPFLAGS=$(CPPFLAGS32) -D__LIBMSVCRT__ $(extra_include) $(sysincludes)
+lib32_libmsvcrt_a_CPPFLAGS=$(CPPFLAGS32) -D__LIBMSVCRT__ $(extra_include) $(extra_include2) $(sysincludes)
EXTRA_lib32_libmsvcrt_a_DEPENDENCIES=lib32/msvcrt.def
endif
lib32_LIBRARIES += lib32/libshell32.a
lib32_libshell32_a_SOURCES = $(src_libshell32)
lib32_libshell32_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
-lib32_libshell32_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libshell32_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_LIBRARIES += lib32/libdinput.a
lib32_libdinput_a_SOURCES = $(src_libdinput)
lib32_libdinput_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
-lib32_libdinput_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libdinput_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_LIBRARIES += lib32/libdinput8.a
lib32_libdinput8_a_SOURCES = $(src_libdinput8)
lib32_libdinput8_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
-lib32_libdinput8_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libdinput8_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_LIBRARIES += lib32/libdmoguids.a
lib32_libdmoguids_a_SOURCES = $(src_libdmoguids)
-lib32_libdmoguids_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libdmoguids_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_LIBRARIES += lib32/libdxerr8.a
lib32_libdxerr8_a_SOURCES = $(src_libdxerr8)
-lib32_libdxerr8_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libdxerr8_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_LIBRARIES += lib32/libdxerr9.a
lib32_libdxerr9_a_SOURCES = $(src_libdxerr9)
-lib32_libdxerr9_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libdxerr9_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_LIBRARIES += lib32/libmfuuid.a
lib32_libmfuuid_a_SOURCES = $(src_libmfuuid)
-lib32_libmfuuid_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+lib32_libmfuuid_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(extra_includeDX) $(sysincludes)
lib32_LIBRARIES += lib32/libamstrmid.a
lib32_libamstrmid_a_SOURCES = $(src_libamstrmid)
-lib32_libamstrmid_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+lib32_libamstrmid_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(extra_includeDX) $(sysincludes)
lib32_LIBRARIES += lib32/libwmcodecdspuuid.a
lib32_libwmcodecdspuuid_a_SOURCES = $(src_libwmcodecdspuuid)
-lib32_libwmcodecdspuuid_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+lib32_libwmcodecdspuuid_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(extra_includeDX) $(sysincludes)
lib32_LIBRARIES += lib32/libwindowscodecs.a
lib32_libwindowscodecs_a_SOURCES = $(src_libwindowscodecs)
-lib32_libwindowscodecs_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+lib32_libwindowscodecs_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(extra_includeDX) $(sysincludes)
lib32_LIBRARIES += lib32/libwbemuuid.a
lib32_libwbemuuid_a_SOURCES = $(src_libwbemuuid)
-lib32_libwbemuuid_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+lib32_libwbemuuid_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_LIBRARIES += lib32/libdxguid.a
lib32_libdxguid_a_SOURCES = $(src_libdxguid)
-lib32_libdxguid_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libdxguid_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(extra_includeDX) $(sysincludes)
lib32_LIBRARIES += lib32/libksuser.a
lib32_libksuser_a_SOURCES = $(src_libksuser)
-lib32_libksuser_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libksuser_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_libksuser_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
lib32_LIBRARIES += lib32/libksguid.a
lib32_libksguid_a_SOURCES = $(src_libksguid)
-lib32_libksguid_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libksguid_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_LIBRARIES += lib32/liblocationapi.a
lib32_liblocationapi_a_SOURCES = $(src_liblocationapi)
-lib32_liblocationapi_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_liblocationapi_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_LIBRARIES += lib32/libsapi.a
lib32_libsapi_a_SOURCES = $(src_libsapi)
-lib32_libsapi_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libsapi_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_LIBRARIES += lib32/libsensorsapi.a
lib32_libsensorsapi_a_SOURCES = $(src_libsensorsapi)
-lib32_libsensorsapi_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libsensorsapi_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_LIBRARIES += lib32/libportabledeviceguids.a
lib32_libportabledeviceguids_a_SOURCES = $(src_libportabledeviceguids)
-lib32_libportabledeviceguids_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libportabledeviceguids_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_LIBRARIES += lib32/libscrnsave.a
lib32_libscrnsave_a_SOURCES = $(src_libscrnsave)
-lib32_libscrnsave_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libscrnsave_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_LIBRARIES += lib32/libscrnsavw.a
lib32_libscrnsavw_a_SOURCES = $(src_libscrnsavw)
-lib32_libscrnsavw_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libscrnsavw_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_libscrnsavw_a_CFLAGS = -DUNICODE
lib32_LIBRARIES += lib32/libstrmiids.a
lib32_libstrmiids_a_SOURCES = $(src_libstrmiids)
-lib32_libstrmiids_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libstrmiids_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_LIBRARIES += lib32/libuuid.a
lib32_libuuid_a_SOURCES = $(src_libuuid)
-lib32_libuuid_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libuuid_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(extra_includeDX) $(sysincludes)
lib32_LIBRARIES += lib32/libgdiplus.a
lib32_libgdiplus_a_SOURCES = $(src_libgdiplus)
-lib32_libgdiplus_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libgdiplus_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_libgdiplus_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
lib32_LIBRARIES += lib32/libws2_32.a
lib32_libws2_32_a_SOURCES = $(src_libws2_32)
-lib32_libws2_32_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libws2_32_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_libws2_32_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
if !W32API
@@ -583,7 +586,7 @@ lib32_libgmon_a_SOURCES = profile/mcount.c \
profile/profil.h profile/profil.c \
profile/gmon.h profile/gmon.c \
profile/mcountFunc.S
-lib32_libgmon_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
+lib32_libgmon_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include2) $(sysincludes)
lib32_LIBRARIES += lib32/liblargeint.a
lib32_liblargeint_a_SOURCES = $(src_liblargeint)
@@ -699,7 +702,7 @@ else
crt64_DATA =
endif
-COMPILE64=$(COMPILE) $(CPPFLAGS64) $(extra_include) -D_SYSCRT=1 -DCRTDLL=1
+COMPILE64=$(COMPILE) $(CPPFLAGS64) $(extra_include) $(extra_include2) -D_SYSCRT=1 -DCRTDLL=1
lib64/crt1.o: crt/crtexe.c
$(COMPILE64) -c $< -o $@ -D__CRTDLL__ -U__MSVCRT__
lib64/crt2.o: crt/crtexe.c
@@ -732,111 +735,111 @@ if !W32API
lib64_LIBRARIES += lib64/libmsvcrt.a
lib64_libmsvcrt_a_SOURCES = $(src_msvcrt) lib64/msvcrt.def.in
lib64_libmsvcrt_a_AR = $(DTDEF64) lib64/msvcrt.def && $(AR) $(ARFLAGS)
-lib64_libmsvcrt_a_CPPFLAGS=$(CPPFLAGS64) -D__LIBMSVCRT__ $(extra_include) $(sysincludes)
+lib64_libmsvcrt_a_CPPFLAGS=$(CPPFLAGS64) -D__LIBMSVCRT__ $(extra_include) $(extra_include2) $(sysincludes)
EXTRA_lib64_libmsvcrt_a_DEPENDENCIES=lib64/msvcrt.def
endif
lib64_LIBRARIES += lib64/libshell32.a
lib64_libshell32_a_SOURCES = $(src_libshell32)
-lib64_libshell32_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libshell32_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_libshell32_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
lib64_LIBRARIES += lib64/libdinput.a
lib64_libdinput_a_SOURCES = $(src_libdinput)
-lib64_libdinput_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libdinput_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_libdinput_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
lib64_LIBRARIES += lib64/libdinput8.a
lib64_libdinput8_a_SOURCES = $(src_libdinput8)
-lib64_libdinput8_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libdinput8_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_libdinput8_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
lib64_LIBRARIES += lib64/libdmoguids.a
lib64_libdmoguids_a_SOURCES = $(src_libdmoguids)
-lib64_libdmoguids_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libdmoguids_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_LIBRARIES += lib64/libdxerr8.a
lib64_libdxerr8_a_SOURCES = $(src_libdxerr8)
-lib64_libdxerr8_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libdxerr8_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_LIBRARIES += lib64/libdxerr9.a
lib64_libdxerr9_a_SOURCES = $(src_libdxerr9)
-lib64_libdxerr9_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libdxerr9_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_LIBRARIES += lib64/libmfuuid.a
lib64_libmfuuid_a_SOURCES = $(src_libmfuuid)
-lib64_libmfuuid_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+lib64_libmfuuid_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(extra_includeDX) $(sysincludes)
lib64_LIBRARIES += lib64/libamstrmid.a
lib64_libamstrmid_a_SOURCES = $(src_libamstrmid)
-lib64_libamstrmid_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+lib64_libamstrmid_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(extra_includeDX) $(sysincludes)
lib64_LIBRARIES += lib64/libwmcodecdspuuid.a
lib64_libwmcodecdspuuid_a_SOURCES = $(src_libwmcodecdspuuid)
-lib64_libwmcodecdspuuid_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+lib64_libwmcodecdspuuid_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(extra_includeDX) $(sysincludes)
lib64_LIBRARIES += lib64/libwindowscodecs.a
lib64_libwindowscodecs_a_SOURCES = $(src_libwindowscodecs)
-lib64_libwindowscodecs_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+lib64_libwindowscodecs_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(extra_includeDX) $(sysincludes)
lib64_LIBRARIES += lib64/libwbemuuid.a
lib64_libwbemuuid_a_SOURCES = $(src_libwbemuuid)
-lib64_libwbemuuid_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libwbemuuid_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_LIBRARIES += lib64/libdxguid.a
lib64_libdxguid_a_SOURCES = $(src_libdxguid)
-lib64_libdxguid_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libdxguid_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(extra_includeDX) $(sysincludes)
lib64_LIBRARIES += lib64/liblocationapi.a
lib64_liblocationapi_a_SOURCES = $(src_liblocationapi)
-lib64_liblocationapi_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_liblocationapi_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_LIBRARIES += lib64/libsapi.a
lib64_libsapi_a_SOURCES = $(src_libsapi)
-lib64_libsapi_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libsapi_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_LIBRARIES += lib64/libsensorsapi.a
lib64_libsensorsapi_a_SOURCES = $(src_libsensorsapi)
-lib64_libsensorsapi_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libsensorsapi_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_LIBRARIES += lib64/libportabledeviceguids.a
lib64_libportabledeviceguids_a_SOURCES = $(src_libportabledeviceguids)
-lib64_libportabledeviceguids_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libportabledeviceguids_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_LIBRARIES += lib64/libksuser.a
lib64_libksuser_a_SOURCES = $(src_libksuser)
-lib64_libksuser_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libksuser_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_libksuser_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
lib64_LIBRARIES += lib64/libksguid.a
lib64_libksguid_a_SOURCES = $(src_libksguid)
-lib64_libksguid_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libksguid_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_LIBRARIES += lib64/libscrnsave.a
lib64_libscrnsave_a_SOURCES = $(src_libscrnsave)
-lib64_libscrnsave_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libscrnsave_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_LIBRARIES += lib64/libscrnsavw.a
lib64_libscrnsavw_a_SOURCES = libsrc/scrnsave.c
-lib64_libscrnsavw_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libscrnsavw_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_libscrnsavw_a_CFLAGS = -DUNICODE
lib64_LIBRARIES += lib64/libstrmiids.a
lib64_libstrmiids_a_SOURCES = $(src_libstrmiids)
-lib64_libstrmiids_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libstrmiids_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_LIBRARIES += lib64/libuuid.a
lib64_libuuid_a_SOURCES = $(src_libuuid)
-lib64_libuuid_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libuuid_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(extra_includeDX) $(sysincludes)
lib64_LIBRARIES += lib64/libgdiplus.a
lib64_libgdiplus_a_SOURCES = $(src_libgdiplus)
-lib64_libgdiplus_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libgdiplus_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_libgdiplus_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
lib64_LIBRARIES += lib64/libws2_32.a
lib64_libws2_32_a_SOURCES = $(src_libws2_32)
-lib64_libws2_32_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libws2_32_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_libws2_32_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
if !W32API
@@ -852,7 +855,7 @@ lib64_libgmon_a_SOURCES = profile/mcount.c \
profile/profil.h profile/profil.c \
profile/gmon.h profile/gmon.c \
profile/mcountFunc.S
-lib64_libgmon_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+lib64_libgmon_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include2) $(sysincludes)
lib64_LIBRARIES += lib64/liblargeint.a
lib64_liblargeint_a_SOURCES = $(src_liblargeint)
@@ -1236,7 +1239,7 @@ else
crt32_DATA =
endif
-COMPILE32=$(COMPILE) $(CPPFLAGSARM32) $(extra_include) -D_SYSCRT=1 -DCRTDLL=1
+COMPILE32=$(COMPILE) $(CPPFLAGSARM32) $(extra_include) $(extra_include2) -D_SYSCRT=1 -DCRTDLL=1
libarm32/crt1.o: crt/crtexe.c
$(COMPILE32) -c $< -o $@ -D__CRTDLL__ -U__MSVCRT__
libarm32/crt2.o: crt/crtexe.c
@@ -1277,101 +1280,101 @@ if !W32API
libarm32_LIBRARIES += libarm32/libmsvcrt.a
libarm32_libmsvcrt_a_SOURCES = $(src_msvcrt32)
libarm32_libmsvcrt_a_AR = $(DTLIBARM32) && $(AR) $(ARFLAGS)
-libarm32_libmsvcrt_a_CPPFLAGS=$(CPPFLAGSARM32) -D__LIBMSVCRT__ $(extra_include) $(sysincludes)
+libarm32_libmsvcrt_a_CPPFLAGS=$(CPPFLAGSARM32) -D__LIBMSVCRT__ $(extra_include) $(extra_include2) $(sysincludes)
EXTRA_libarm32_libmsvcrt_a_DEPENDENCIES=libarm32/msvcrt.def
endif
libarm32_LIBRARIES += libarm32/libshell32.a
libarm32_libshell32_a_SOURCES = $(src_libshell32)
libarm32_libshell32_a_AR = $(DTLIBARM32) && $(AR) $(ARFLAGS)
-libarm32_libshell32_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libshell32_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_LIBRARIES += libarm32/libdmoguids.a
libarm32_libdmoguids_a_SOURCES = $(src_libdmoguids)
-libarm32_libdmoguids_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libdmoguids_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_LIBRARIES += libarm32/libdxerr8.a
libarm32_libdxerr8_a_SOURCES = $(src_libdxerr8)
-libarm32_libdxerr8_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libdxerr8_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_LIBRARIES += libarm32/libdxerr9.a
libarm32_libdxerr9_a_SOURCES = $(src_libdxerr9)
-libarm32_libdxerr9_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libdxerr9_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_LIBRARIES += libarm32/libmfuuid.a
libarm32_libmfuuid_a_SOURCES = $(src_libmfuuid)
-libarm32_libmfuuid_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+libarm32_libmfuuid_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(extra_includeDX) $(sysincludes)
libarm32_LIBRARIES += libarm32/libamstrmid.a
libarm32_libamstrmid_a_SOURCES = $(src_libamstrmid)
-libarm32_libamstrmid_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+libarm32_libamstrmid_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(extra_includeDX) $(sysincludes)
libarm32_LIBRARIES += libarm32/libwmcodecdspuuid.a
libarm32_libwmcodecdspuuid_a_SOURCES = $(src_libwmcodecdspuuid)
-libarm32_libwmcodecdspuuid_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+libarm32_libwmcodecdspuuid_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(extra_includeDX) $(sysincludes)
libarm32_LIBRARIES += libarm32/libwindowscodecs.a
libarm32_libwindowscodecs_a_SOURCES = $(src_libwindowscodecs)
-libarm32_libwindowscodecs_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+libarm32_libwindowscodecs_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(extra_includeDX) $(sysincludes)
libarm32_LIBRARIES += libarm32/libwbemuuid.a
libarm32_libwbemuuid_a_SOURCES = $(src_libwbemuuid)
-libarm32_libwbemuuid_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+libarm32_libwbemuuid_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_LIBRARIES += libarm32/libdxguid.a
libarm32_libdxguid_a_SOURCES = $(src_libdxguid)
-libarm32_libdxguid_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libdxguid_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(extra_includeDX) $(sysincludes)
libarm32_LIBRARIES += libarm32/libksuser.a
libarm32_libksuser_a_SOURCES = $(src_libksuser)
-libarm32_libksuser_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libksuser_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_libksuser_a_AR = $(DTLIBARM32) && $(AR) $(ARFLAGS)
libarm32_LIBRARIES += libarm32/libksguid.a
libarm32_libksguid_a_SOURCES = $(src_libksguid)
-libarm32_libksguid_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libksguid_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_LIBRARIES += libarm32/liblocationapi.a
libarm32_liblocationapi_a_SOURCES = $(src_liblocationapi)
-libarm32_liblocationapi_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_liblocationapi_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_LIBRARIES += libarm32/libsensorsapi.a
libarm32_libsensorsapi_a_SOURCES = $(src_libsensorsapi)
-libarm32_libsensorsapi_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libsensorsapi_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_LIBRARIES += libarm32/libsapi.a
libarm32_libsapi_a_SOURCES = $(src_libsapi)
-libarm32_libsapi_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libsapi_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_LIBRARIES += libarm32/libportabledeviceguids.a
libarm32_libportabledeviceguids_a_SOURCES = $(src_libportabledeviceguids)
-libarm32_libportabledeviceguids_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libportabledeviceguids_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_LIBRARIES += libarm32/libscrnsave.a
libarm32_libscrnsave_a_SOURCES = $(src_libscrnsave)
-libarm32_libscrnsave_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libscrnsave_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_LIBRARIES += libarm32/libscrnsavw.a
libarm32_libscrnsavw_a_SOURCES = $(src_libscrnsavw)
-libarm32_libscrnsavw_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libscrnsavw_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_libscrnsavw_a_CFLAGS = -DUNICODE
libarm32_LIBRARIES += libarm32/libstrmiids.a
libarm32_libstrmiids_a_SOURCES = $(src_libstrmiids)
-libarm32_libstrmiids_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libstrmiids_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_LIBRARIES += libarm32/libuuid.a
libarm32_libuuid_a_SOURCES = $(src_libuuid)
-libarm32_libuuid_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libuuid_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(extra_includeDX) $(sysincludes)
libarm32_LIBRARIES += libarm32/libgdiplus.a
libarm32_libgdiplus_a_SOURCES = $(src_libgdiplus)
-libarm32_libgdiplus_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libgdiplus_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_libgdiplus_a_AR = $(DTLIBARM32) && $(AR) $(ARFLAGS)
libarm32_LIBRARIES += libarm32/libws2_32.a
libarm32_libws2_32_a_SOURCES = $(src_libws2_32)
-libarm32_libws2_32_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+libarm32_libws2_32_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_libws2_32_a_AR = $(DTLIBARM32) && $(AR) $(ARFLAGS)
if !W32API
@@ -1387,7 +1390,7 @@ libarm32_libm_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
# profile/profil.h profile/profil.c \
# profile/gmon.h profile/gmon.c \
# profile/mcountFunc.S
-#libarm32_libgmon_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
+#libarm32_libgmon_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
libarm32_LIBRARIES += libarm32/liblargeint.a
libarm32_liblargeint_a_SOURCES = $(src_liblargeint)
diff --git a/mingw-w64-headers/Makefile.am b/mingw-w64-headers/Makefile.am
index 8c92b40..d2843b3 100644
--- a/mingw-w64-headers/Makefile.am
+++ b/mingw-w64-headers/Makefile.am
@@ -221,7 +221,11 @@ BUILT_SOURCES = $(IDL_SRCS:.idl=.h)
endif
_mingw_directx.h: $(srcdir)/crt/sdks/_mingw_directx.h.in
- $(SED) s/MINGW_HAS_DX$$/@MINGW_HAS_DX@/ $< > $@
+ mkdir -p crt/sdks
+ $(SED) s/MINGW_HAS_DX$$/@MINGW_HAS_DX@/ $< > crt/sdks/$@
+ cp crt/sdks/$@ .
_mingw_ddk.h: $(srcdir)/crt/sdks/_mingw_ddk.h.in
- $(SED) s/MINGW_HAS_DDK$$/@MINGW_HAS_DDK@/ $< > $@
+ mkdir -p crt/sdks
+ $(SED) s/MINGW_HAS_DDK$$/@MINGW_HAS_DDK@/ $< > crt/sdks/$@
+ cp crt/sdks/$@ .
------------------------------------------------------------------------------
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
