On 8/25/2016 11:19 PM, lhmouse wrote:
I haven't had a deep look at the patch, but AFAICS the problem is a simple
matter
that can be solved by adding `-nostdinc
-I"path/to/the/directory/of/new/headers"`
to `CPPFLAGS` when building the CRT.
Thanks for the reply.
I'm not clear how adding -nostdinc helps anything. Using -I already
adds the new directories before the "standard" directories. And it's
not like we want to (or even can) exclude all the standard directories.
There are header files there that we need in order to build.
While it may be possible to recover the standard include directories
using some nasty unix trick, I don't see that it buys us anything. The
problem is that the current build simply isn't searching all the
directories it should.
As for using CPPFLAGS, we could do that (or just use CPATH). It would
work, and would be a smaller change. But I'm reluctant to add more
search paths to the build than we really need. While it may look like
I'm adding all the paths to every build command, I'm not. There are some
that need extra_include2, some that need extra_include2 &
extra_includeDX, and some that don't need either. I tried to only add
what's needed. There is also the possibility of name collisions between
directories, which would make using "every path every time" a bit of a
problem.
On the other hand, CPPFLAGS/CPATH might make future maintenance easier.
After all, how do you "know" if you have the right include paths set on
some new file you add? If you get it wrong, it will just use something
from the toolsdir that might be close enough to *look* like you've got
it right.
If we want to go with CPPFLAGS/CPATH (or use Kai's 'magic' configure
script), we can. Seems like a judgement call for the mingw-w64
experts/owners.
If someone would like to try this to confirm I it works on platforms
other than MSys2, I have attached a version of the patch that includes
the generated files. Other than including the generated files, this is
the same patch.
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-crt/Makefile.in b/mingw-w64-crt/Makefile.in
index 58c05c2..6a74c88 100644
--- a/mingw-w64-crt/Makefile.in
+++ b/mingw-w64-crt/Makefile.in
@@ -190,7 +190,7 @@ host_triplet = @host@
# 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_TRUE@@W32API_FALSE@am__append_11 = libarm32/libdelayimp.a \
@LIBARM32_TRUE@@W32API_FALSE@ libarm32/libm.a \
@LIBARM32_TRUE@@W32API_FALSE@ libarm32/liblargeint.a \
@@ -5087,11 +5087,13 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+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
@WITHSYSROOT_FALSE@sysincludes =
@WITHSYSROOT_TRUE@sysincludes = -I@TARGET_SYSTEM_ROOT@/include
@WITHSYSROOT_FALSE@withsys =
@WITHSYSROOT_TRUE@withsys = --with-sysroot=@TARGET_SYSTEM_ROOT@
-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
@@ -5482,8 +5484,8 @@ src_intrincsarm32 =
@LIBARM32_TRUE@@W32API_FALSE@ libarm32/gcrt0.o libarm32/gcrt1.o libarm32/gcrt2.o libarm32/CRT_glob.o libarm32/CRT_noglob.o
@LIBARM32_TRUE@@W32API_TRUE@crt32_DATA =
-@LIB32_TRUE@COMPILE32 = $(COMPILE) $(CPPFLAGS32) $(extra_include) -D_SYSCRT=1 -DCRTDLL=1
-@LIBARM32_TRUE@COMPILE32 = $(COMPILE) $(CPPFLAGSARM32) $(extra_include) -D_SYSCRT=1 -DCRTDLL=1
+@LIB32_TRUE@COMPILE32 = $(COMPILE) $(CPPFLAGS32) $(extra_include) $(extra_include2) -D_SYSCRT=1 -DCRTDLL=1
+@LIBARM32_TRUE@COMPILE32 = $(COMPILE) $(CPPFLAGSARM32) $(extra_include) $(extra_include2) -D_SYSCRT=1 -DCRTDLL=1
# These source files aren't compiled in to any library yet. I'm not sure how / where to do so.
# The source files that I did compile somewhere I just guessed at anyway.
@@ -5519,62 +5521,62 @@ src_intrincsarm32 =
@LIB32_TRUE@lib32_libkernel32_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include) $(AM_CPPFLAGS)
@LIB32_TRUE@@W32API_FALSE@lib32_libmsvcrt_a_SOURCES = $(src_msvcrt32) lib32/msvcrt.def.in
@LIB32_TRUE@@W32API_FALSE@lib32_libmsvcrt_a_AR = $(DTDEF32) lib32/msvcrt.def && $(AR) $(ARFLAGS)
-@LIB32_TRUE@@W32API_FALSE@lib32_libmsvcrt_a_CPPFLAGS = $(CPPFLAGS32) -D__LIBMSVCRT__ $(extra_include) $(sysincludes)
+@LIB32_TRUE@@W32API_FALSE@lib32_libmsvcrt_a_CPPFLAGS = $(CPPFLAGS32) -D__LIBMSVCRT__ $(extra_include) $(extra_include2) $(sysincludes)
@LIB32_TRUE@@W32API_FALSE@EXTRA_lib32_libmsvcrt_a_DEPENDENCIES = lib32/msvcrt.def
@LIB32_TRUE@lib32_libshell32_a_SOURCES = $(src_libshell32)
@LIB32_TRUE@lib32_libshell32_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
-@LIB32_TRUE@lib32_libshell32_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libshell32_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libdinput_a_SOURCES = $(src_libdinput)
@LIB32_TRUE@lib32_libdinput_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
-@LIB32_TRUE@lib32_libdinput_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libdinput_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libdinput8_a_SOURCES = $(src_libdinput8)
@LIB32_TRUE@lib32_libdinput8_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
-@LIB32_TRUE@lib32_libdinput8_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libdinput8_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libdmoguids_a_SOURCES = $(src_libdmoguids)
-@LIB32_TRUE@lib32_libdmoguids_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libdmoguids_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libdxerr8_a_SOURCES = $(src_libdxerr8)
-@LIB32_TRUE@lib32_libdxerr8_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libdxerr8_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libdxerr9_a_SOURCES = $(src_libdxerr9)
-@LIB32_TRUE@lib32_libdxerr9_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libdxerr9_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libmfuuid_a_SOURCES = $(src_libmfuuid)
-@LIB32_TRUE@lib32_libmfuuid_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libmfuuid_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIB32_TRUE@lib32_libamstrmid_a_SOURCES = $(src_libamstrmid)
-@LIB32_TRUE@lib32_libamstrmid_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libamstrmid_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIB32_TRUE@lib32_libwmcodecdspuuid_a_SOURCES = $(src_libwmcodecdspuuid)
-@LIB32_TRUE@lib32_libwmcodecdspuuid_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libwmcodecdspuuid_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIB32_TRUE@lib32_libwindowscodecs_a_SOURCES = $(src_libwindowscodecs)
-@LIB32_TRUE@lib32_libwindowscodecs_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libwindowscodecs_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIB32_TRUE@lib32_libwbemuuid_a_SOURCES = $(src_libwbemuuid)
-@LIB32_TRUE@lib32_libwbemuuid_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libwbemuuid_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libdxguid_a_SOURCES = $(src_libdxguid)
-@LIB32_TRUE@lib32_libdxguid_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libdxguid_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIB32_TRUE@lib32_libksuser_a_SOURCES = $(src_libksuser)
-@LIB32_TRUE@lib32_libksuser_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libksuser_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libksuser_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
@LIB32_TRUE@lib32_libksguid_a_SOURCES = $(src_libksguid)
-@LIB32_TRUE@lib32_libksguid_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libksguid_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_liblocationapi_a_SOURCES = $(src_liblocationapi)
-@LIB32_TRUE@lib32_liblocationapi_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_liblocationapi_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libsapi_a_SOURCES = $(src_libsapi)
-@LIB32_TRUE@lib32_libsapi_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libsapi_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libsensorsapi_a_SOURCES = $(src_libsensorsapi)
-@LIB32_TRUE@lib32_libsensorsapi_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libsensorsapi_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libportabledeviceguids_a_SOURCES = $(src_libportabledeviceguids)
-@LIB32_TRUE@lib32_libportabledeviceguids_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libportabledeviceguids_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libscrnsave_a_SOURCES = $(src_libscrnsave)
-@LIB32_TRUE@lib32_libscrnsave_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libscrnsave_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libscrnsavw_a_SOURCES = $(src_libscrnsavw)
-@LIB32_TRUE@lib32_libscrnsavw_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libscrnsavw_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libscrnsavw_a_CFLAGS = -DUNICODE
@LIB32_TRUE@lib32_libstrmiids_a_SOURCES = $(src_libstrmiids)
-@LIB32_TRUE@lib32_libstrmiids_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libstrmiids_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libuuid_a_SOURCES = $(src_libuuid)
-@LIB32_TRUE@lib32_libuuid_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libuuid_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIB32_TRUE@lib32_libgdiplus_a_SOURCES = $(src_libgdiplus)
-@LIB32_TRUE@lib32_libgdiplus_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libgdiplus_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libgdiplus_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
@LIB32_TRUE@lib32_libws2_32_a_SOURCES = $(src_libws2_32)
-@LIB32_TRUE@lib32_libws2_32_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@lib32_libws2_32_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@lib32_libws2_32_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
@LIB32_TRUE@@W32API_FALSE@lib32_libdelayimp_a_SOURCES =
@LIB32_TRUE@@W32API_FALSE@nodist_lib32_libm_a_SOURCES = $(src_libm)
@@ -5584,7 +5586,7 @@ src_intrincsarm32 =
@LIB32_TRUE@@W32API_FALSE@ profile/gmon.h profile/gmon.c \
@LIB32_TRUE@@W32API_FALSE@ profile/mcountFunc.S
-@LIB32_TRUE@@W32API_FALSE@lib32_libgmon_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
+@LIB32_TRUE@@W32API_FALSE@lib32_libgmon_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include2) $(sysincludes)
@LIB32_TRUE@@W32API_FALSE@lib32_liblargeint_a_SOURCES = $(src_liblargeint)
@LIB32_TRUE@@W32API_FALSE@lib32_liblargeint_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
@LIB32_TRUE@@W32API_FALSE@lib32_libmingw32_a_CPPFLAGS = $(CPPFLAGS32) -D_SYSCRT=1 -DCRTDLL=1 $(extra_include) $(AM_CPPFLAGS)
@@ -5790,7 +5792,7 @@ src_intrincsarm32 =
@LIB64_TRUE@@W32API_FALSE@ lib64/gcrt0.o lib64/gcrt1.o lib64/gcrt2.o lib64/CRT_glob.o lib64/CRT_noglob.o
@LIB64_TRUE@@W32API_TRUE@crt64_DATA =
-@LIB64_TRUE@COMPILE64 = $(COMPILE) $(CPPFLAGS64) $(extra_include) -D_SYSCRT=1 -DCRTDLL=1
+@LIB64_TRUE@COMPILE64 = $(COMPILE) $(CPPFLAGS64) $(extra_include) $(extra_include2) -D_SYSCRT=1 -DCRTDLL=1
@LIB64_TRUE@lib64_LIBRARIES = lib64/libkernel32.a $(am__append_6) \
@LIB64_TRUE@ lib64/libshell32.a lib64/libdinput.a \
@LIB64_TRUE@ lib64/libdinput8.a lib64/libdmoguids.a \
@@ -5810,62 +5812,62 @@ src_intrincsarm32 =
@LIB64_TRUE@lib64_libkernel32_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
@LIB64_TRUE@@W32API_FALSE@lib64_libmsvcrt_a_SOURCES = $(src_msvcrt) lib64/msvcrt.def.in
@LIB64_TRUE@@W32API_FALSE@lib64_libmsvcrt_a_AR = $(DTDEF64) lib64/msvcrt.def && $(AR) $(ARFLAGS)
-@LIB64_TRUE@@W32API_FALSE@lib64_libmsvcrt_a_CPPFLAGS = $(CPPFLAGS64) -D__LIBMSVCRT__ $(extra_include) $(sysincludes)
+@LIB64_TRUE@@W32API_FALSE@lib64_libmsvcrt_a_CPPFLAGS = $(CPPFLAGS64) -D__LIBMSVCRT__ $(extra_include) $(extra_include2) $(sysincludes)
@LIB64_TRUE@@W32API_FALSE@EXTRA_lib64_libmsvcrt_a_DEPENDENCIES = lib64/msvcrt.def
@LIB64_TRUE@lib64_libshell32_a_SOURCES = $(src_libshell32)
-@LIB64_TRUE@lib64_libshell32_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libshell32_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libshell32_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
@LIB64_TRUE@lib64_libdinput_a_SOURCES = $(src_libdinput)
-@LIB64_TRUE@lib64_libdinput_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libdinput_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libdinput_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
@LIB64_TRUE@lib64_libdinput8_a_SOURCES = $(src_libdinput8)
-@LIB64_TRUE@lib64_libdinput8_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libdinput8_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libdinput8_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
@LIB64_TRUE@lib64_libdmoguids_a_SOURCES = $(src_libdmoguids)
-@LIB64_TRUE@lib64_libdmoguids_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libdmoguids_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libdxerr8_a_SOURCES = $(src_libdxerr8)
-@LIB64_TRUE@lib64_libdxerr8_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libdxerr8_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libdxerr9_a_SOURCES = $(src_libdxerr9)
-@LIB64_TRUE@lib64_libdxerr9_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libdxerr9_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libmfuuid_a_SOURCES = $(src_libmfuuid)
-@LIB64_TRUE@lib64_libmfuuid_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libmfuuid_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIB64_TRUE@lib64_libamstrmid_a_SOURCES = $(src_libamstrmid)
-@LIB64_TRUE@lib64_libamstrmid_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libamstrmid_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIB64_TRUE@lib64_libwmcodecdspuuid_a_SOURCES = $(src_libwmcodecdspuuid)
-@LIB64_TRUE@lib64_libwmcodecdspuuid_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libwmcodecdspuuid_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIB64_TRUE@lib64_libwindowscodecs_a_SOURCES = $(src_libwindowscodecs)
-@LIB64_TRUE@lib64_libwindowscodecs_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libwindowscodecs_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIB64_TRUE@lib64_libwbemuuid_a_SOURCES = $(src_libwbemuuid)
-@LIB64_TRUE@lib64_libwbemuuid_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libwbemuuid_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libdxguid_a_SOURCES = $(src_libdxguid)
-@LIB64_TRUE@lib64_libdxguid_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libdxguid_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIB64_TRUE@lib64_liblocationapi_a_SOURCES = $(src_liblocationapi)
-@LIB64_TRUE@lib64_liblocationapi_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_liblocationapi_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libsapi_a_SOURCES = $(src_libsapi)
-@LIB64_TRUE@lib64_libsapi_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libsapi_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libsensorsapi_a_SOURCES = $(src_libsensorsapi)
-@LIB64_TRUE@lib64_libsensorsapi_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libsensorsapi_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libportabledeviceguids_a_SOURCES = $(src_libportabledeviceguids)
-@LIB64_TRUE@lib64_libportabledeviceguids_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libportabledeviceguids_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libksuser_a_SOURCES = $(src_libksuser)
-@LIB64_TRUE@lib64_libksuser_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libksuser_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libksuser_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
@LIB64_TRUE@lib64_libksguid_a_SOURCES = $(src_libksguid)
-@LIB64_TRUE@lib64_libksguid_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libksguid_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libscrnsave_a_SOURCES = $(src_libscrnsave)
-@LIB64_TRUE@lib64_libscrnsave_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libscrnsave_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libscrnsavw_a_SOURCES = libsrc/scrnsave.c
-@LIB64_TRUE@lib64_libscrnsavw_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libscrnsavw_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libscrnsavw_a_CFLAGS = -DUNICODE
@LIB64_TRUE@lib64_libstrmiids_a_SOURCES = $(src_libstrmiids)
-@LIB64_TRUE@lib64_libstrmiids_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libstrmiids_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libuuid_a_SOURCES = $(src_libuuid)
-@LIB64_TRUE@lib64_libuuid_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libuuid_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIB64_TRUE@lib64_libgdiplus_a_SOURCES = $(src_libgdiplus)
-@LIB64_TRUE@lib64_libgdiplus_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libgdiplus_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libgdiplus_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
@LIB64_TRUE@lib64_libws2_32_a_SOURCES = $(src_libws2_32)
-@LIB64_TRUE@lib64_libws2_32_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@lib64_libws2_32_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@lib64_libws2_32_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
@LIB64_TRUE@@W32API_FALSE@lib64_libdelayimp_a_SOURCES =
@LIB64_TRUE@@W32API_FALSE@nodist_lib64_libm_a_SOURCES = $(src_libm)
@@ -5875,7 +5877,7 @@ src_intrincsarm32 =
@LIB64_TRUE@@W32API_FALSE@ profile/gmon.h profile/gmon.c \
@LIB64_TRUE@@W32API_FALSE@ profile/mcountFunc.S
-@LIB64_TRUE@@W32API_FALSE@lib64_libgmon_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
+@LIB64_TRUE@@W32API_FALSE@lib64_libgmon_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include2) $(sysincludes)
@LIB64_TRUE@@W32API_FALSE@lib64_liblargeint_a_SOURCES = $(src_liblargeint)
@LIB64_TRUE@@W32API_FALSE@lib64_liblargeint_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
@LIB64_TRUE@@W32API_FALSE@lib64_libmingw32_a_CPPFLAGS = $(CPPFLAGS64) -D_SYSCRT=1 -DCRTDLL=1 $(extra_include) $(AM_CPPFLAGS)
@@ -6531,56 +6533,56 @@ src_intrincsarm32 =
@LIBARM32_TRUE@libarm32_libkernel32_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include) $(AM_CPPFLAGS)
@LIBARM32_TRUE@@W32API_FALSE@libarm32_libmsvcrt_a_SOURCES = $(src_msvcrt32)
@LIBARM32_TRUE@@W32API_FALSE@libarm32_libmsvcrt_a_AR = $(DTLIBARM32) && $(AR) $(ARFLAGS)
-@LIBARM32_TRUE@@W32API_FALSE@libarm32_libmsvcrt_a_CPPFLAGS = $(CPPFLAGSARM32) -D__LIBMSVCRT__ $(extra_include) $(sysincludes)
+@LIBARM32_TRUE@@W32API_FALSE@libarm32_libmsvcrt_a_CPPFLAGS = $(CPPFLAGSARM32) -D__LIBMSVCRT__ $(extra_include) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@@W32API_FALSE@EXTRA_libarm32_libmsvcrt_a_DEPENDENCIES = libarm32/msvcrt.def
@LIBARM32_TRUE@libarm32_libshell32_a_SOURCES = $(src_libshell32)
@LIBARM32_TRUE@libarm32_libshell32_a_AR = $(DTLIBARM32) && $(AR) $(ARFLAGS)
-@LIBARM32_TRUE@libarm32_libshell32_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libshell32_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_libdmoguids_a_SOURCES = $(src_libdmoguids)
-@LIBARM32_TRUE@libarm32_libdmoguids_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libdmoguids_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_libdxerr8_a_SOURCES = $(src_libdxerr8)
-@LIBARM32_TRUE@libarm32_libdxerr8_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libdxerr8_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_libdxerr9_a_SOURCES = $(src_libdxerr9)
-@LIBARM32_TRUE@libarm32_libdxerr9_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libdxerr9_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_libmfuuid_a_SOURCES = $(src_libmfuuid)
-@LIBARM32_TRUE@libarm32_libmfuuid_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libmfuuid_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIBARM32_TRUE@libarm32_libamstrmid_a_SOURCES = $(src_libamstrmid)
-@LIBARM32_TRUE@libarm32_libamstrmid_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libamstrmid_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIBARM32_TRUE@libarm32_libwmcodecdspuuid_a_SOURCES = $(src_libwmcodecdspuuid)
-@LIBARM32_TRUE@libarm32_libwmcodecdspuuid_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libwmcodecdspuuid_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIBARM32_TRUE@libarm32_libwindowscodecs_a_SOURCES = $(src_libwindowscodecs)
-@LIBARM32_TRUE@libarm32_libwindowscodecs_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libwindowscodecs_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIBARM32_TRUE@libarm32_libwbemuuid_a_SOURCES = $(src_libwbemuuid)
-@LIBARM32_TRUE@libarm32_libwbemuuid_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libwbemuuid_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_libdxguid_a_SOURCES = $(src_libdxguid)
-@LIBARM32_TRUE@libarm32_libdxguid_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libdxguid_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIBARM32_TRUE@libarm32_libksuser_a_SOURCES = $(src_libksuser)
-@LIBARM32_TRUE@libarm32_libksuser_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libksuser_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_libksuser_a_AR = $(DTLIBARM32) && $(AR) $(ARFLAGS)
@LIBARM32_TRUE@libarm32_libksguid_a_SOURCES = $(src_libksguid)
-@LIBARM32_TRUE@libarm32_libksguid_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libksguid_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_liblocationapi_a_SOURCES = $(src_liblocationapi)
-@LIBARM32_TRUE@libarm32_liblocationapi_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_liblocationapi_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_libsensorsapi_a_SOURCES = $(src_libsensorsapi)
-@LIBARM32_TRUE@libarm32_libsensorsapi_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libsensorsapi_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_libsapi_a_SOURCES = $(src_libsapi)
-@LIBARM32_TRUE@libarm32_libsapi_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libsapi_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_libportabledeviceguids_a_SOURCES = $(src_libportabledeviceguids)
-@LIBARM32_TRUE@libarm32_libportabledeviceguids_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libportabledeviceguids_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_libscrnsave_a_SOURCES = $(src_libscrnsave)
-@LIBARM32_TRUE@libarm32_libscrnsave_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libscrnsave_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_libscrnsavw_a_SOURCES = $(src_libscrnsavw)
-@LIBARM32_TRUE@libarm32_libscrnsavw_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libscrnsavw_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_libscrnsavw_a_CFLAGS = -DUNICODE
@LIBARM32_TRUE@libarm32_libstrmiids_a_SOURCES = $(src_libstrmiids)
-@LIBARM32_TRUE@libarm32_libstrmiids_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libstrmiids_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_libuuid_a_SOURCES = $(src_libuuid)
-@LIBARM32_TRUE@libarm32_libuuid_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libuuid_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(extra_includeDX) $(sysincludes)
@LIBARM32_TRUE@libarm32_libgdiplus_a_SOURCES = $(src_libgdiplus)
-@LIBARM32_TRUE@libarm32_libgdiplus_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libgdiplus_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_libgdiplus_a_AR = $(DTLIBARM32) && $(AR) $(ARFLAGS)
@LIBARM32_TRUE@libarm32_libws2_32_a_SOURCES = $(src_libws2_32)
-@LIBARM32_TRUE@libarm32_libws2_32_a_CPPFLAGS = $(CPPFLAGSARM32) $(sysincludes)
+@LIBARM32_TRUE@libarm32_libws2_32_a_CPPFLAGS = $(CPPFLAGSARM32) $(extra_include2) $(sysincludes)
@LIBARM32_TRUE@libarm32_libws2_32_a_AR = $(DTLIBARM32) && $(AR) $(ARFLAGS)
@LIBARM32_TRUE@@W32API_FALSE@libarm32_libdelayimp_a_SOURCES =
@LIBARM32_TRUE@@W32API_FALSE@nodist_libarm32_libm_a_SOURCES = $(src_libm)
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/$@ .
diff --git a/mingw-w64-headers/Makefile.in b/mingw-w64-headers/Makefile.in
index 34a2074..99e04e5 100644
--- a/mingw-w64-headers/Makefile.in
+++ b/mingw-w64-headers/Makefile.in
@@ -1229,10 +1229,14 @@ dist-hook:
@HAVE_WIDL_TRUE@ $(WIDL) -DBOOL=WINBOOL -I$(srcdir)/include -I$(srcdir)/direct-x/include -Icrt -I$(srcdir)/crt -h -o $@ $<
_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/$@ .
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
------------------------------------------------------------------------------
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
