These DLLs might not have been present in the version of windows
where libarm32 was dumped from originally, but they're available
in current versions of Windows 10, for both arm32 and arm64.

Signed-off-by: Martin Storsjö <[email protected]>
---
 mingw-w64-crt/Makefile.am                     | 20 +++++++++++++++++++
 .../{lib64 => lib-common}/dinput.def          |  0
 .../{lib64 => lib-common}/dinput8.def         |  0
 mingw-w64-crt/libarm32/Makefile.am            |  2 ++
 mingw-w64-crt/libarm64/Makefile.am            |  2 ++
 5 files changed, 24 insertions(+)
 rename mingw-w64-crt/{lib64 => lib-common}/dinput.def (100%)
 rename mingw-w64-crt/{lib64 => lib-common}/dinput8.def (100%)

diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 9d2154b84..e87965e18 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -1322,6 +1322,16 @@ libarm32_libshell32_a_SOURCES = $(src_libshell32)
 libarm32_libshell32_a_AR = $(DTDEFARM32) $(top_srcdir)/lib-common/shell32.def 
&& $(AR) $(ARFLAGS)
 libarm32_libshell32_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
 
+libarm32_LIBRARIES += libarm32/libdinput.a
+libarm32_libdinput_a_SOURCES = $(src_libdinput)
+libarm32_libdinput_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+libarm32_libdinput_a_AR = $(DTLIBARM32) && $(AR) $(ARFLAGS)
+
+libarm32_LIBRARIES += libarm32/libdinput8.a
+libarm32_libdinput8_a_SOURCES = $(src_libdinput8)
+libarm32_libdinput8_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+libarm32_libdinput8_a_AR = $(DTLIBARM32) && $(AR) $(ARFLAGS)
+
 libarm32_LIBRARIES += libarm32/libdmoguids.a
 libarm32_libdmoguids_a_SOURCES = $(src_libdmoguids)
 libarm32_libdmoguids_a_CPPFLAGS=$(CPPFLAGSARM32) $(sysincludes)
@@ -1591,6 +1601,16 @@ libarm64_libshell32_a_SOURCES = $(src_libshell32)
 libarm64_libshell32_a_AR = $(DTDEFARM64) $(top_srcdir)/lib-common/shell32.def 
&& $(AR) $(ARFLAGS)
 libarm64_libshell32_a_CPPFLAGS=$(CPPFLAGSARM64) $(sysincludes)
 
+libarm64_LIBRARIES += libarm64/libdinput.a
+libarm64_libdinput_a_SOURCES = $(src_libdinput)
+libarm64_libdinput_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+libarm64_libdinput_a_AR = $(DTLIBARM64) && $(AR) $(ARFLAGS)
+
+libarm64_LIBRARIES += libarm64/libdinput8.a
+libarm64_libdinput8_a_SOURCES = $(src_libdinput8)
+libarm64_libdinput8_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
+libarm64_libdinput8_a_AR = $(DTLIBARM64) && $(AR) $(ARFLAGS)
+
 libarm64_LIBRARIES += libarm64/libdmoguids.a
 libarm64_libdmoguids_a_SOURCES = $(src_libdmoguids)
 libarm64_libdmoguids_a_CPPFLAGS=$(CPPFLAGSARM64) $(sysincludes)
diff --git a/mingw-w64-crt/lib64/dinput.def 
b/mingw-w64-crt/lib-common/dinput.def
similarity index 100%
rename from mingw-w64-crt/lib64/dinput.def
rename to mingw-w64-crt/lib-common/dinput.def
diff --git a/mingw-w64-crt/lib64/dinput8.def 
b/mingw-w64-crt/lib-common/dinput8.def
similarity index 100%
rename from mingw-w64-crt/lib64/dinput8.def
rename to mingw-w64-crt/lib-common/dinput8.def
diff --git a/mingw-w64-crt/libarm32/Makefile.am 
b/mingw-w64-crt/libarm32/Makefile.am
index 85bcfe0fe..e7fde98b8 100644
--- a/mingw-w64-crt/libarm32/Makefile.am
+++ b/mingw-w64-crt/libarm32/Makefile.am
@@ -165,6 +165,8 @@ libarm32_DATA += %reldir%/libdhcpqec.a
 libarm32_DATA += %reldir%/libdhcpsapi.a
 libarm32_DATA += %reldir%/libdiagperf.a
 libarm32_DATA += %reldir%/libdimsroam.a
+#libarm32_DATA += %reldir%/libdinput.a    # Handled by custom rule
+#libarm32_DATA += %reldir%/libdinput8.a   # Handled by custom rule
 libarm32_DATA += %reldir%/libdiskcopy.a
 libarm32_DATA += %reldir%/libdismapi.a
 libarm32_DATA += %reldir%/libdispci.a
diff --git a/mingw-w64-crt/libarm64/Makefile.am 
b/mingw-w64-crt/libarm64/Makefile.am
index 6a680ac35..a5bdc71f5 100644
--- a/mingw-w64-crt/libarm64/Makefile.am
+++ b/mingw-w64-crt/libarm64/Makefile.am
@@ -64,6 +64,8 @@ libarm64_DATA += %reldir%/libdfscli.a
 libarm64_DATA += %reldir%/libdhcpcsvc.a
 libarm64_DATA += %reldir%/libdhcpsapi.a
 libarm64_DATA += %reldir%/libdimsroam.a
+#libarm64_DATA += %reldir%/libdinput.a    # Handled by custom rule
+#libarm64_DATA += %reldir%/libdinput8.a   # Handled by custom rule
 libarm64_DATA += %reldir%/libdiskcopy.a
 libarm64_DATA += %reldir%/libdmutil.a
 libarm64_DATA += %reldir%/libdnsapi.a
-- 
2.17.1



_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to