Signed-off-by: Jacek Caban <ja...@codeweavers.com>
---
mingw-w64-crt/Makefile.am | 171 +++++++++++++-------------------
 mingw-w64-crt/lib-common/windowsapp.mri |  66 ++++++++++++
 mingw-w64-crt/lib32/windowsapp.mri      |  72 --------------
 mingw-w64-crt/lib64/windowsapp.mri      |  66 ------------
 mingw-w64-crt/libarm32/windowsapp.mri   |  66 ------------
 mingw-w64-crt/libarm64/windowsapp.mri   |  66 ------------
 6 files changed, 134 insertions(+), 373 deletions(-)
 create mode 100644 mingw-w64-crt/lib-common/windowsapp.mri
 delete mode 100644 mingw-w64-crt/lib32/windowsapp.mri
 delete mode 100644 mingw-w64-crt/lib64/windowsapp.mri
 delete mode 100644 mingw-w64-crt/libarm32/windowsapp.mri
 delete mode 100644 mingw-w64-crt/libarm64/windowsapp.mri


diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 434b9b06..78736150 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -749,33 +749,6 @@ lib32/lib%.a: lib32/%.def
 lib32/lib%.a: lib-common/%.def
 	$(DTDEF32) $<
 
-lib32/libwindowsapp.a: lib32/windowsapp.mri lib32/libapi-ms-win-core-com-l1-1-1.a lib32/libapi-ms-win-core-com-l2-1-1.a lib32/libapi-ms-win-core-com-midlproxystub-l1-1-0.a \
-					lib32/libapi-ms-win-core-datetime-l1-1-1.a lib32/libapi-ms-win-core-datetime-l1-1-2.a lib32/libapi-ms-win-core-debug-l1-1-1.a \
-					lib32/libapi-ms-win-core-delayload-l1-1-1.a lib32/libapi-ms-win-core-errorhandling-l1-1-1.a lib32/libapi-ms-win-core-errorhandling-l1-1-3.a \
-					lib32/libapi-ms-win-core-featurestaging-l1-1-0.a lib32/libapi-ms-win-core-fibers-l1-1-1.a lib32/libapi-ms-win-core-fibers-l2-1-1.a \
-					lib32/libapi-ms-win-core-file-ansi-l2-1-0.a lib32/libapi-ms-win-core-file-l1-2-1.a lib32/libapi-ms-win-core-file-l2-1-1.a \
-					lib32/libapi-ms-win-core-handle-l1-1-0.a lib32/libapi-ms-win-core-heap-l1-2-0.a lib32/libapi-ms-win-core-heap-l2-1-0.a \
-					lib32/libapi-ms-win-core-heap-obsolete-l1-1-0.a lib32/libapi-ms-win-core-interlocked-l1-2-0.a lib32/libapi-ms-win-core-io-l1-1-1.a \
-					lib32/libapi-ms-win-core-kernel32-legacy-l1-1-1.a lib32/libapi-ms-win-core-largeinteger-l1-1-0.a lib32/libapi-ms-win-core-libraryloader-l1-2-0.a \
-					lib32/libapi-ms-win-core-libraryloader-l2-1-0.a lib32/libapi-ms-win-core-localization-ansi-l1-1-0.a lib32/libapi-ms-win-core-localization-l1-2-1.a \
-					lib32/libapi-ms-win-core-localization-l1-2-2.a lib32/libapi-ms-win-core-localization-l2-1-0.a lib32/libapi-ms-win-core-memory-l1-1-2.a \
-					lib32/libapi-ms-win-core-memory-l1-1-4.a lib32/libapi-ms-win-core-normalization-l1-1-0.a lib32/libapi-ms-win-core-processenvironment-l1-2-0.a \
-					lib32/libapi-ms-win-core-processthreads-l1-1-2.a lib32/libapi-ms-win-core-processthreads-l1-1-3.a lib32/libapi-ms-win-core-profile-l1-1-0.a \
-					lib32/libapi-ms-win-core-psapi-l1-1-0.a lib32/libapi-ms-win-core-realtime-l1-1-0.a lib32/libapi-ms-win-core-realtime-l1-1-1.a \
-					lib32/libapi-ms-win-core-rtlsupport-l1-2-0.a lib32/libapi-ms-win-core-slapi-l1-1-0.a lib32/libapi-ms-win-core-string-l1-1-0.a \
-					lib32/libapi-ms-win-core-synch-ansi-l1-1-0.a lib32/libapi-ms-win-core-synch-l1-2-0.a lib32/libapi-ms-win-core-synch-l1-2-1.a \
-					lib32/libapi-ms-win-core-sysinfo-l1-2-1.a lib32/libapi-ms-win-core-sysinfo-l1-2-3.a lib32/libapi-ms-win-core-threadpool-l1-2-0.a \
-					lib32/libapi-ms-win-core-timezone-l1-1-0.a lib32/libapi-ms-win-core-util-l1-1-0.a lib32/libapi-ms-win-core-windowsceip-l1-1-0.a \
-					lib32/libapi-ms-win-core-windowserrorreporting-l1-1-0.a lib32/libapi-ms-win-core-winrt-error-l1-1-1.a lib32/libapi-ms-win-core-winrt-l1-1-0.a \
-					lib32/libapi-ms-win-core-winrt-registration-l1-1-0.a lib32/libapi-ms-win-core-winrt-robuffer-l1-1-0.a lib32/libapi-ms-win-core-winrt-roparameterizediid-l1-1-0.a \
-					lib32/libapi-ms-win-core-winrt-string-l1-1-0.a lib32/libapi-ms-win-core-xstate-l2-1-0.a lib32/libapi-ms-win-eventing-classicprovider-l1-1-0.a \
-					lib32/libapi-ms-win-eventing-consumer-l1-1-0.a lib32/libapi-ms-win-eventing-controller-l1-1-0.a lib32/libapi-ms-win-eventing-legacy-l1-1-0.a \
-					lib32/libapi-ms-win-eventing-provider-l1-1-0.a lib32/libapi-ms-win-gaming-tcui-l1-1-2.a lib32/libapi-ms-win-ro-typeresolution-l1-1-0.a \
-					lib32/libapi-ms-win-security-base-l1-2-1.a lib32/libapi-ms-win-security-cryptoapi-l1-1-0.a lib32/libapi-ms-win-shcore-stream-winrt-l1-1-0.a
-	rm -f $@
-	$(AR) -M < $<
-	$(RANLIB) $@
-
 lib32/libucrt.a: lib32/ucrt.mri lib32/libucrt_extra.a \
 		lib32/libapi-ms-win-crt-conio-l1-1-0.a lib32/libapi-ms-win-crt-convert-l1-1-0.a lib32/libapi-ms-win-crt-environment-l1-1-0.a \
 		lib32/libapi-ms-win-crt-filesystem-l1-1-0.a lib32/libapi-ms-win-crt-heap-l1-1-0.a lib32/libapi-ms-win-crt-locale-l1-1-0.a \
@@ -1113,33 +1086,6 @@ lib64/lib%.a: lib64/%.def
 lib64/lib%.a: lib-common/%.def
 	$(DTDEF64) $<
 
-lib64/libwindowsapp.a: lib64/windowsapp.mri lib64/libapi-ms-win-core-com-l1-1-1.a lib64/libapi-ms-win-core-com-l2-1-1.a \
-	lib64/libapi-ms-win-core-com-midlproxystub-l1-1-0.a lib64/libapi-ms-win-core-datetime-l1-1-1.a lib64/libapi-ms-win-core-datetime-l1-1-2.a \
-	lib64/libapi-ms-win-core-debug-l1-1-1.a lib64/libapi-ms-win-core-delayload-l1-1-1.a lib64/libapi-ms-win-core-errorhandling-l1-1-1.a \
-	lib64/libapi-ms-win-core-errorhandling-l1-1-3.a lib64/libapi-ms-win-core-fibers-l1-1-1.a lib64/libapi-ms-win-core-fibers-l2-1-1.a \
-	lib64/libapi-ms-win-core-file-ansi-l2-1-0.a lib64/libapi-ms-win-core-file-l1-2-1.a lib64/libapi-ms-win-core-file-l2-1-1.a \
-	lib64/libapi-ms-win-core-handle-l1-1-0.a lib64/libapi-ms-win-core-heap-l1-2-0.a lib64/libapi-ms-win-core-interlocked-l1-2-0.a \
-	lib64/libapi-ms-win-core-io-l1-1-1.a lib64/libapi-ms-win-core-kernel32-legacy-l1-1-1.a lib64/libapi-ms-win-core-largeinteger-l1-1-0.a \
-	lib64/libapi-ms-win-core-libraryloader-l1-2-0.a lib64/libapi-ms-win-core-libraryloader-l2-1-0.a lib64/libapi-ms-win-core-localization-ansi-l1-1-0.a \
-	lib64/libapi-ms-win-core-localization-l1-2-1.a lib64/libapi-ms-win-core-localization-l1-2-2.a lib64/libapi-ms-win-core-localization-l2-1-0.a \
-	lib64/libapi-ms-win-core-memory-l1-1-2.a lib64/libapi-ms-win-core-memory-l1-1-3.a lib64/libapi-ms-win-core-normalization-l1-1-0.a \
-	lib64/libapi-ms-win-core-processenvironment-l1-2-0.a lib64/libapi-ms-win-core-processthreads-l1-1-2.a lib64/libapi-ms-win-core-processthreads-l1-1-3.a \
-	lib64/libapi-ms-win-core-profile-l1-1-0.a lib64/libapi-ms-win-core-realtime-l1-1-0.a lib64/libapi-ms-win-core-realtime-l1-1-1.a \
-	lib64/libapi-ms-win-core-rtlsupport-l1-2-0.a lib64/libapi-ms-win-core-string-l1-1-0.a lib64/libapi-ms-win-core-synch-ansi-l1-1-0.a \
-	lib64/libapi-ms-win-core-synch-l1-2-0.a lib64/libapi-ms-win-core-synch-l1-2-1.a lib64/libapi-ms-win-core-sysinfo-l1-2-1.a \
-	lib64/libapi-ms-win-core-sysinfo-l1-2-3.a lib64/libapi-ms-win-core-threadpool-l1-2-0.a lib64/libapi-ms-win-core-timezone-l1-1-0.a \
-	lib64/libapi-ms-win-core-util-l1-1-0.a lib64/libapi-ms-win-core-windowsceip-l1-1-0.a lib64/libapi-ms-win-core-windowserrorreporting-l1-1-0.a \
-	lib64/libapi-ms-win-core-winrt-error-l1-1-1.a lib64/libapi-ms-win-core-winrt-l1-1-0.a lib64/libapi-ms-win-core-winrt-registration-l1-1-0.a \
-	lib64/libapi-ms-win-core-winrt-robuffer-l1-1-0.a lib64/libapi-ms-win-core-winrt-roparameterizediid-l1-1-0.a lib64/libapi-ms-win-core-winrt-string-l1-1-0.a \
-	lib64/libapi-ms-win-core-xstate-l2-1-0.a lib64/libapi-ms-win-eventing-classicprovider-l1-1-0.a lib64/libapi-ms-win-eventing-consumer-l1-1-0.a \
-	lib64/libapi-ms-win-eventing-controller-l1-1-0.a lib64/libapi-ms-win-eventing-legacy-l1-1-0.a lib64/libapi-ms-win-eventing-provider-l1-1-0.a \
-	lib64/libapi-ms-win-gaming-tcui-l1-1-0.a lib64/libapi-ms-win-ro-typeresolution-l1-1-0.a lib64/libapi-ms-win-security-cryptoapi-l1-1-0.a \
-	lib64/libapi-ms-win-shcore-stream-winrt-l1-1-0.a
-
-	rm -f $@
-	$(AR) -M < $<
-	$(RANLIB) $@
-
 lib64/libucrt.a: lib64/ucrt.mri lib64/libucrt_extra.a \
 		lib64/libapi-ms-win-crt-conio-l1-1-0.a lib64/libapi-ms-win-crt-convert-l1-1-0.a lib64/libapi-ms-win-crt-environment-l1-1-0.a \
 		lib64/libapi-ms-win-crt-filesystem-l1-1-0.a lib64/libapi-ms-win-crt-heap-l1-1-0.a lib64/libapi-ms-win-crt-locale-l1-1-0.a \
@@ -1421,32 +1367,6 @@ libarm32/lib%.a: libarm32/%.def
 libarm32/lib%.a: lib-common/%.def
 	$(DTDEFARM32) $<
 
-libarm32/libwindowsapp.a: libarm32/windowsapp.mri libarm32/libapi-ms-win-core-com-l1-1-1.a libarm32/libapi-ms-win-core-com-l2-1-1.a \
-	libarm32/libapi-ms-win-core-com-midlproxystub-l1-1-0.a libarm32/libapi-ms-win-core-datetime-l1-1-1.a libarm32/libapi-ms-win-core-datetime-l1-1-2.a \
-	libarm32/libapi-ms-win-core-debug-l1-1-1.a libarm32/libapi-ms-win-core-delayload-l1-1-1.a libarm32/libapi-ms-win-core-errorhandling-l1-1-1.a \
-	libarm32/libapi-ms-win-core-errorhandling-l1-1-3.a libarm32/libapi-ms-win-core-fibers-l1-1-1.a libarm32/libapi-ms-win-core-fibers-l2-1-1.a \
-	libarm32/libapi-ms-win-core-file-ansi-l2-1-0.a libarm32/libapi-ms-win-core-file-l1-2-1.a libarm32/libapi-ms-win-core-file-l2-1-1.a \
-	libarm32/libapi-ms-win-core-handle-l1-1-0.a libarm32/libapi-ms-win-core-heap-l1-2-0.a libarm32/libapi-ms-win-core-interlocked-l1-2-0.a \
-	libarm32/libapi-ms-win-core-io-l1-1-1.a libarm32/libapi-ms-win-core-kernel32-legacy-l1-1-1.a libarm32/libapi-ms-win-core-largeinteger-l1-1-0.a \
-	libarm32/libapi-ms-win-core-libraryloader-l1-2-0.a libarm32/libapi-ms-win-core-libraryloader-l2-1-0.a libarm32/libapi-ms-win-core-localization-ansi-l1-1-0.a \
-	libarm32/libapi-ms-win-core-localization-l1-2-1.a libarm32/libapi-ms-win-core-localization-l1-2-2.a libarm32/libapi-ms-win-core-localization-l2-1-0.a \
-	libarm32/libapi-ms-win-core-memory-l1-1-2.a libarm32/libapi-ms-win-core-memory-l1-1-3.a libarm32/libapi-ms-win-core-normalization-l1-1-0.a \
-	libarm32/libapi-ms-win-core-processenvironment-l1-2-0.a libarm32/libapi-ms-win-core-processthreads-l1-1-2.a libarm32/libapi-ms-win-core-processthreads-l1-1-3.a \
-	libarm32/libapi-ms-win-core-profile-l1-1-0.a libarm32/libapi-ms-win-core-realtime-l1-1-0.a libarm32/libapi-ms-win-core-realtime-l1-1-1.a \
-	libarm32/libapi-ms-win-core-rtlsupport-l1-2-0.a libarm32/libapi-ms-win-core-string-l1-1-0.a libarm32/libapi-ms-win-core-synch-ansi-l1-1-0.a \
-	libarm32/libapi-ms-win-core-synch-l1-2-0.a libarm32/libapi-ms-win-core-synch-l1-2-1.a libarm32/libapi-ms-win-core-sysinfo-l1-2-1.a \
-	libarm32/libapi-ms-win-core-sysinfo-l1-2-3.a libarm32/libapi-ms-win-core-threadpool-l1-2-0.a libarm32/libapi-ms-win-core-timezone-l1-1-0.a \
-	libarm32/libapi-ms-win-core-util-l1-1-0.a libarm32/libapi-ms-win-core-windowsceip-l1-1-0.a libarm32/libapi-ms-win-core-windowserrorreporting-l1-1-0.a \
-	libarm32/libapi-ms-win-core-winrt-error-l1-1-1.a libarm32/libapi-ms-win-core-winrt-l1-1-0.a libarm32/libapi-ms-win-core-winrt-registration-l1-1-0.a \
-	libarm32/libapi-ms-win-core-winrt-robuffer-l1-1-0.a libarm32/libapi-ms-win-core-winrt-roparameterizediid-l1-1-0.a libarm32/libapi-ms-win-core-winrt-string-l1-1-0.a \
-	libarm32/libapi-ms-win-core-xstate-l2-1-0.a libarm32/libapi-ms-win-eventing-classicprovider-l1-1-0.a libarm32/libapi-ms-win-eventing-consumer-l1-1-0.a \
-	libarm32/libapi-ms-win-eventing-controller-l1-1-0.a libarm32/libapi-ms-win-eventing-legacy-l1-1-0.a libarm32/libapi-ms-win-eventing-provider-l1-1-0.a \
-	libarm32/libapi-ms-win-gaming-tcui-l1-1-0.a libarm32/libapi-ms-win-ro-typeresolution-l1-1-0.a libarm32/libapi-ms-win-security-cryptoapi-l1-1-0.a \
-	libarm32/libapi-ms-win-shcore-stream-winrt-l1-1-0.a
-
-	rm -f $@
-	$(AR) -M < $<
-	$(RANLIB) $@
 
 libarm32/libucrt.a: libarm32/ucrt.mri libarm32/libucrt_extra.a \
 		libarm32/libapi-ms-win-crt-conio-l1-1-0.a libarm32/libapi-ms-win-crt-convert-l1-1-0.a libarm32/libapi-ms-win-crt-environment-l1-1-0.a \
@@ -1703,29 +1623,6 @@ libarm64/lib%.a: libarm64/%.def
 libarm64/lib%.a: lib-common/%.def
 	$(DTDEFARM64) $<
 
-libarm64/libwindowsapp.a: libarm64/windowsapp.mri libarm64/libapi-ms-win-core-com-l1-1-1.a libarm64/libapi-ms-win-core-com-l2-1-1.a \
-	libarm64/libapi-ms-win-core-com-midlproxystub-l1-1-0.a libarm64/libapi-ms-win-core-datetime-l1-1-1.a libarm64/libapi-ms-win-core-datetime-l1-1-2.a \
-	libarm64/libapi-ms-win-core-debug-l1-1-1.a libarm64/libapi-ms-win-core-delayload-l1-1-1.a libarm64/libapi-ms-win-core-errorhandling-l1-1-1.a \
-	libarm64/libapi-ms-win-core-errorhandling-l1-1-3.a libarm64/libapi-ms-win-core-fibers-l1-1-1.a libarm64/libapi-ms-win-core-fibers-l2-1-1.a \
-	libarm64/libapi-ms-win-core-file-ansi-l2-1-0.a libarm64/libapi-ms-win-core-file-l1-2-1.a libarm64/libapi-ms-win-core-file-l2-1-1.a \
-	libarm64/libapi-ms-win-core-handle-l1-1-0.a libarm64/libapi-ms-win-core-heap-l1-2-0.a libarm64/libapi-ms-win-core-interlocked-l1-2-0.a \
-	libarm64/libapi-ms-win-core-io-l1-1-1.a libarm64/libapi-ms-win-core-kernel32-legacy-l1-1-1.a libarm64/libapi-ms-win-core-largeinteger-l1-1-0.a \
-	libarm64/libapi-ms-win-core-libraryloader-l1-2-0.a libarm64/libapi-ms-win-core-libraryloader-l2-1-0.a libarm64/libapi-ms-win-core-localization-ansi-l1-1-0.a \
-	libarm64/libapi-ms-win-core-localization-l1-2-1.a libarm64/libapi-ms-win-core-localization-l1-2-2.a libarm64/libapi-ms-win-core-localization-l2-1-0.a \
-	libarm64/libapi-ms-win-core-memory-l1-1-2.a libarm64/libapi-ms-win-core-memory-l1-1-3.a libarm64/libapi-ms-win-core-normalization-l1-1-0.a \
-	libarm64/libapi-ms-win-core-processenvironment-l1-2-0.a libarm64/libapi-ms-win-core-processthreads-l1-1-2.a libarm64/libapi-ms-win-core-processthreads-l1-1-3.a \
-	libarm64/libapi-ms-win-core-profile-l1-1-0.a libarm64/libapi-ms-win-core-realtime-l1-1-0.a libarm64/libapi-ms-win-core-realtime-l1-1-1.a \
-	libarm64/libapi-ms-win-core-rtlsupport-l1-2-0.a libarm64/libapi-ms-win-core-string-l1-1-0.a libarm64/libapi-ms-win-core-synch-ansi-l1-1-0.a \
-	libarm64/libapi-ms-win-core-synch-l1-2-0.a libarm64/libapi-ms-win-core-synch-l1-2-1.a libarm64/libapi-ms-win-core-sysinfo-l1-2-1.a \
-	libarm64/libapi-ms-win-core-sysinfo-l1-2-3.a libarm64/libapi-ms-win-core-threadpool-l1-2-0.a libarm64/libapi-ms-win-core-timezone-l1-1-0.a \
-	libarm64/libapi-ms-win-core-util-l1-1-0.a libarm64/libapi-ms-win-core-windowsceip-l1-1-0.a libarm64/libapi-ms-win-core-windowserrorreporting-l1-1-0.a \
-	libarm64/libapi-ms-win-core-winrt-error-l1-1-1.a libarm64/libapi-ms-win-core-winrt-l1-1-0.a libarm64/libapi-ms-win-core-winrt-registration-l1-1-0.a \
-	libarm64/libapi-ms-win-core-winrt-robuffer-l1-1-0.a libarm64/libapi-ms-win-core-winrt-roparameterizediid-l1-1-0.a libarm64/libapi-ms-win-core-winrt-string-l1-1-0.a \
-	libarm64/libapi-ms-win-core-xstate-l2-1-0.a libarm64/libapi-ms-win-eventing-classicprovider-l1-1-0.a libarm64/libapi-ms-win-eventing-consumer-l1-1-0.a \
-	libarm64/libapi-ms-win-eventing-controller-l1-1-0.a libarm64/libapi-ms-win-eventing-legacy-l1-1-0.a libarm64/libapi-ms-win-eventing-provider-l1-1-0.a \
-	libarm64/libapi-ms-win-gaming-tcui-l1-1-0.a libarm64/libapi-ms-win-ro-typeresolution-l1-1-0.a libarm64/libapi-ms-win-security-cryptoapi-l1-1-0.a \
-	libarm64/libapi-ms-win-shcore-stream-winrt-l1-1-0.a
-
 	rm -f $@
 	$(AR) -M < $<
 	$(RANLIB) $@
@@ -1834,6 +1731,74 @@ endif
 	cd $(dir $@) && $(AR) -M < $(abspath $<)
 	$(RANLIB) $@
 
+%/libwindowsapp.a: lib-common/windowsapp.mri \
+		%/libapi-ms-win-core-com-l1-1-1.a \
+		%/libapi-ms-win-core-com-l2-1-1.a \
+		%/libapi-ms-win-core-com-midlproxystub-l1-1-0.a \
+		%/libapi-ms-win-core-datetime-l1-1-1.a \
+		%/libapi-ms-win-core-datetime-l1-1-2.a \
+		%/libapi-ms-win-core-debug-l1-1-1.a \
+		%/libapi-ms-win-core-delayload-l1-1-1.a \
+		%/libapi-ms-win-core-errorhandling-l1-1-1.a \
+		%/libapi-ms-win-core-errorhandling-l1-1-3.a \
+		%/libapi-ms-win-core-fibers-l1-1-1.a \
+		%/libapi-ms-win-core-fibers-l2-1-1.a \
+		%/libapi-ms-win-core-file-ansi-l2-1-0.a \
+		%/libapi-ms-win-core-file-l1-2-1.a \
+		%/libapi-ms-win-core-file-l2-1-1.a \
+		%/libapi-ms-win-core-handle-l1-1-0.a \
+		%/libapi-ms-win-core-heap-l1-2-0.a \
+		%/libapi-ms-win-core-interlocked-l1-2-0.a \
+		%/libapi-ms-win-core-io-l1-1-1.a \
+		%/libapi-ms-win-core-kernel32-legacy-l1-1-1.a \
+		%/libapi-ms-win-core-largeinteger-l1-1-0.a \
+		%/libapi-ms-win-core-libraryloader-l1-2-0.a \
+		%/libapi-ms-win-core-libraryloader-l2-1-0.a \
+		%/libapi-ms-win-core-localization-ansi-l1-1-0.a \
+		%/libapi-ms-win-core-localization-l1-2-1.a \
+		%/libapi-ms-win-core-localization-l1-2-2.a \
+		%/libapi-ms-win-core-localization-l2-1-0.a \
+		%/libapi-ms-win-core-memory-l1-1-2.a \
+		%/libapi-ms-win-core-memory-l1-1-3.a \
+		%/libapi-ms-win-core-normalization-l1-1-0.a \
+		%/libapi-ms-win-core-processenvironment-l1-2-0.a \
+		%/libapi-ms-win-core-processthreads-l1-1-2.a \
+		%/libapi-ms-win-core-processthreads-l1-1-3.a \
+		%/libapi-ms-win-core-profile-l1-1-0.a \
+		%/libapi-ms-win-core-realtime-l1-1-0.a \
+		%/libapi-ms-win-core-realtime-l1-1-1.a \
+		%/libapi-ms-win-core-rtlsupport-l1-2-0.a \
+		%/libapi-ms-win-core-string-l1-1-0.a \
+		%/libapi-ms-win-core-synch-ansi-l1-1-0.a \
+		%/libapi-ms-win-core-synch-l1-2-0.a \
+		%/libapi-ms-win-core-synch-l1-2-1.a \
+		%/libapi-ms-win-core-sysinfo-l1-2-1.a \
+		%/libapi-ms-win-core-sysinfo-l1-2-3.a \
+		%/libapi-ms-win-core-threadpool-l1-2-0.a \
+		%/libapi-ms-win-core-timezone-l1-1-0.a \
+		%/libapi-ms-win-core-util-l1-1-0.a \
+		%/libapi-ms-win-core-windowsceip-l1-1-0.a \
+		%/libapi-ms-win-core-windowserrorreporting-l1-1-0.a \
+		%/libapi-ms-win-core-winrt-error-l1-1-1.a \
+		%/libapi-ms-win-core-winrt-l1-1-0.a \
+		%/libapi-ms-win-core-winrt-registration-l1-1-0.a \
+		%/libapi-ms-win-core-winrt-robuffer-l1-1-0.a \
+		%/libapi-ms-win-core-winrt-roparameterizediid-l1-1-0.a \
+		%/libapi-ms-win-core-winrt-string-l1-1-0.a \
+		%/libapi-ms-win-core-xstate-l2-1-0.a \
+		%/libapi-ms-win-eventing-classicprovider-l1-1-0.a \
+		%/libapi-ms-win-eventing-consumer-l1-1-0.a \
+		%/libapi-ms-win-eventing-controller-l1-1-0.a \
+		%/libapi-ms-win-eventing-legacy-l1-1-0.a \
+		%/libapi-ms-win-eventing-provider-l1-1-0.a \
+		%/libapi-ms-win-gaming-tcui-l1-1-0.a \
+		%/libapi-ms-win-ro-typeresolution-l1-1-0.a \
+		%/libapi-ms-win-security-cryptoapi-l1-1-0.a \
+		%/libapi-ms-win-shcore-stream-winrt-l1-1-0.a
+	rm -f $@
+	cd $(dir $@) && $(AR) -M < $(abspath $<)
+	$(RANLIB) $@
+
 %/libvfw32.a: lib-common/vfw32.mri \
 		%/libmsvfw32.a \
 		%/libavifil32.a \
diff --git a/mingw-w64-crt/lib-common/windowsapp.mri b/mingw-w64-crt/lib-common/windowsapp.mri
new file mode 100644
index 00000000..f7e17753
--- /dev/null
+++ b/mingw-w64-crt/lib-common/windowsapp.mri
@@ -0,0 +1,66 @@
+CREATE libwindowsapp.a
+ADDLIB libapi-ms-win-core-com-l1-1-1.a
+ADDLIB libapi-ms-win-core-com-l2-1-1.a
+ADDLIB libapi-ms-win-core-com-midlproxystub-l1-1-0.a
+ADDLIB libapi-ms-win-core-datetime-l1-1-1.a
+ADDLIB libapi-ms-win-core-datetime-l1-1-2.a
+ADDLIB libapi-ms-win-core-debug-l1-1-1.a
+ADDLIB libapi-ms-win-core-delayload-l1-1-1.a
+ADDLIB libapi-ms-win-core-errorhandling-l1-1-1.a
+ADDLIB libapi-ms-win-core-errorhandling-l1-1-3.a
+ADDLIB libapi-ms-win-core-fibers-l1-1-1.a
+ADDLIB libapi-ms-win-core-fibers-l2-1-1.a
+ADDLIB libapi-ms-win-core-file-ansi-l2-1-0.a
+ADDLIB libapi-ms-win-core-file-l1-2-1.a
+ADDLIB libapi-ms-win-core-file-l2-1-1.a
+ADDLIB libapi-ms-win-core-handle-l1-1-0.a
+ADDLIB libapi-ms-win-core-heap-l1-2-0.a
+ADDLIB libapi-ms-win-core-interlocked-l1-2-0.a
+ADDLIB libapi-ms-win-core-io-l1-1-1.a
+ADDLIB libapi-ms-win-core-kernel32-legacy-l1-1-1.a
+ADDLIB libapi-ms-win-core-largeinteger-l1-1-0.a
+ADDLIB libapi-ms-win-core-libraryloader-l1-2-0.a
+ADDLIB libapi-ms-win-core-libraryloader-l2-1-0.a
+ADDLIB libapi-ms-win-core-localization-ansi-l1-1-0.a
+ADDLIB libapi-ms-win-core-localization-l1-2-1.a
+ADDLIB libapi-ms-win-core-localization-l1-2-2.a
+ADDLIB libapi-ms-win-core-localization-l2-1-0.a
+ADDLIB libapi-ms-win-core-memory-l1-1-2.a
+ADDLIB libapi-ms-win-core-memory-l1-1-3.a
+ADDLIB libapi-ms-win-core-normalization-l1-1-0.a
+ADDLIB libapi-ms-win-core-processenvironment-l1-2-0.a
+ADDLIB libapi-ms-win-core-processthreads-l1-1-2.a
+ADDLIB libapi-ms-win-core-processthreads-l1-1-3.a
+ADDLIB libapi-ms-win-core-profile-l1-1-0.a
+ADDLIB libapi-ms-win-core-realtime-l1-1-0.a
+ADDLIB libapi-ms-win-core-realtime-l1-1-1.a
+ADDLIB libapi-ms-win-core-rtlsupport-l1-2-0.a
+ADDLIB libapi-ms-win-core-string-l1-1-0.a
+ADDLIB libapi-ms-win-core-synch-ansi-l1-1-0.a
+ADDLIB libapi-ms-win-core-synch-l1-2-0.a
+ADDLIB libapi-ms-win-core-synch-l1-2-1.a
+ADDLIB libapi-ms-win-core-sysinfo-l1-2-1.a
+ADDLIB libapi-ms-win-core-sysinfo-l1-2-3.a
+ADDLIB libapi-ms-win-core-threadpool-l1-2-0.a
+ADDLIB libapi-ms-win-core-timezone-l1-1-0.a
+ADDLIB libapi-ms-win-core-util-l1-1-0.a
+ADDLIB libapi-ms-win-core-windowsceip-l1-1-0.a
+ADDLIB libapi-ms-win-core-windowserrorreporting-l1-1-0.a
+ADDLIB libapi-ms-win-core-winrt-error-l1-1-1.a
+ADDLIB libapi-ms-win-core-winrt-l1-1-0.a
+ADDLIB libapi-ms-win-core-winrt-registration-l1-1-0.a
+ADDLIB libapi-ms-win-core-winrt-robuffer-l1-1-0.a
+ADDLIB libapi-ms-win-core-winrt-roparameterizediid-l1-1-0.a
+ADDLIB libapi-ms-win-core-winrt-string-l1-1-0.a
+ADDLIB libapi-ms-win-core-xstate-l2-1-0.a
+ADDLIB libapi-ms-win-eventing-classicprovider-l1-1-0.a
+ADDLIB libapi-ms-win-eventing-consumer-l1-1-0.a
+ADDLIB libapi-ms-win-eventing-controller-l1-1-0.a
+ADDLIB libapi-ms-win-eventing-legacy-l1-1-0.a
+ADDLIB libapi-ms-win-eventing-provider-l1-1-0.a
+ADDLIB libapi-ms-win-gaming-tcui-l1-1-0.a
+ADDLIB libapi-ms-win-ro-typeresolution-l1-1-0.a
+ADDLIB libapi-ms-win-security-cryptoapi-l1-1-0.a
+ADDLIB libapi-ms-win-shcore-stream-winrt-l1-1-0.a
+SAVE
+END
diff --git a/mingw-w64-crt/lib32/windowsapp.mri b/mingw-w64-crt/lib32/windowsapp.mri
deleted file mode 100644
index 65cca815..00000000
--- a/mingw-w64-crt/lib32/windowsapp.mri
+++ /dev/null
@@ -1,72 +0,0 @@
-CREATE lib32/libwindowsapp.a
-ADDLIB lib32/libapi-ms-win-core-com-l1-1-1.a
-ADDLIB lib32/libapi-ms-win-core-com-l2-1-1.a
-ADDLIB lib32/libapi-ms-win-core-com-midlproxystub-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-datetime-l1-1-1.a
-ADDLIB lib32/libapi-ms-win-core-datetime-l1-1-2.a
-ADDLIB lib32/libapi-ms-win-core-debug-l1-1-1.a
-ADDLIB lib32/libapi-ms-win-core-delayload-l1-1-1.a
-ADDLIB lib32/libapi-ms-win-core-errorhandling-l1-1-1.a
-ADDLIB lib32/libapi-ms-win-core-errorhandling-l1-1-3.a
-ADDLIB lib32/libapi-ms-win-core-featurestaging-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-fibers-l1-1-1.a
-ADDLIB lib32/libapi-ms-win-core-fibers-l2-1-1.a
-ADDLIB lib32/libapi-ms-win-core-file-ansi-l2-1-0.a
-ADDLIB lib32/libapi-ms-win-core-file-l1-2-1.a
-ADDLIB lib32/libapi-ms-win-core-file-l2-1-1.a
-ADDLIB lib32/libapi-ms-win-core-handle-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-heap-l1-2-0.a
-ADDLIB lib32/libapi-ms-win-core-heap-l2-1-0.a
-ADDLIB lib32/libapi-ms-win-core-heap-obsolete-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-interlocked-l1-2-0.a
-ADDLIB lib32/libapi-ms-win-core-io-l1-1-1.a
-ADDLIB lib32/libapi-ms-win-core-kernel32-legacy-l1-1-1.a
-ADDLIB lib32/libapi-ms-win-core-largeinteger-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-libraryloader-l1-2-0.a
-ADDLIB lib32/libapi-ms-win-core-libraryloader-l2-1-0.a
-ADDLIB lib32/libapi-ms-win-core-localization-ansi-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-localization-l1-2-1.a
-ADDLIB lib32/libapi-ms-win-core-localization-l1-2-2.a
-ADDLIB lib32/libapi-ms-win-core-localization-l2-1-0.a
-ADDLIB lib32/libapi-ms-win-core-memory-l1-1-2.a
-ADDLIB lib32/libapi-ms-win-core-memory-l1-1-4.a
-ADDLIB lib32/libapi-ms-win-core-normalization-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-processenvironment-l1-2-0.a
-ADDLIB lib32/libapi-ms-win-core-processthreads-l1-1-2.a
-ADDLIB lib32/libapi-ms-win-core-processthreads-l1-1-3.a
-ADDLIB lib32/libapi-ms-win-core-profile-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-psapi-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-realtime-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-realtime-l1-1-1.a
-ADDLIB lib32/libapi-ms-win-core-rtlsupport-l1-2-0.a
-ADDLIB lib32/libapi-ms-win-core-slapi-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-string-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-synch-ansi-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-synch-l1-2-0.a
-ADDLIB lib32/libapi-ms-win-core-synch-l1-2-1.a
-ADDLIB lib32/libapi-ms-win-core-sysinfo-l1-2-1.a
-ADDLIB lib32/libapi-ms-win-core-sysinfo-l1-2-3.a
-ADDLIB lib32/libapi-ms-win-core-threadpool-l1-2-0.a
-ADDLIB lib32/libapi-ms-win-core-timezone-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-util-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-windowsceip-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-windowserrorreporting-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-winrt-error-l1-1-1.a
-ADDLIB lib32/libapi-ms-win-core-winrt-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-winrt-registration-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-winrt-robuffer-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-winrt-roparameterizediid-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-winrt-string-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-core-xstate-l2-1-0.a
-ADDLIB lib32/libapi-ms-win-eventing-classicprovider-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-eventing-consumer-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-eventing-controller-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-eventing-legacy-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-eventing-provider-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-gaming-tcui-l1-1-2.a
-ADDLIB lib32/libapi-ms-win-ro-typeresolution-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-security-base-l1-2-1.a
-ADDLIB lib32/libapi-ms-win-security-cryptoapi-l1-1-0.a
-ADDLIB lib32/libapi-ms-win-shcore-stream-winrt-l1-1-0.a
-SAVE
-END
diff --git a/mingw-w64-crt/lib64/windowsapp.mri b/mingw-w64-crt/lib64/windowsapp.mri
deleted file mode 100644
index 148483fb..00000000
--- a/mingw-w64-crt/lib64/windowsapp.mri
+++ /dev/null
@@ -1,66 +0,0 @@
-CREATE lib64/libwindowsapp.a
-ADDLIB lib64/libapi-ms-win-core-com-l1-1-1.a
-ADDLIB lib64/libapi-ms-win-core-com-l2-1-1.a
-ADDLIB lib64/libapi-ms-win-core-com-midlproxystub-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-datetime-l1-1-1.a
-ADDLIB lib64/libapi-ms-win-core-datetime-l1-1-2.a
-ADDLIB lib64/libapi-ms-win-core-debug-l1-1-1.a
-ADDLIB lib64/libapi-ms-win-core-delayload-l1-1-1.a
-ADDLIB lib64/libapi-ms-win-core-errorhandling-l1-1-1.a
-ADDLIB lib64/libapi-ms-win-core-errorhandling-l1-1-3.a
-ADDLIB lib64/libapi-ms-win-core-fibers-l1-1-1.a
-ADDLIB lib64/libapi-ms-win-core-fibers-l2-1-1.a
-ADDLIB lib64/libapi-ms-win-core-file-ansi-l2-1-0.a
-ADDLIB lib64/libapi-ms-win-core-file-l1-2-1.a
-ADDLIB lib64/libapi-ms-win-core-file-l2-1-1.a
-ADDLIB lib64/libapi-ms-win-core-handle-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-heap-l1-2-0.a
-ADDLIB lib64/libapi-ms-win-core-interlocked-l1-2-0.a
-ADDLIB lib64/libapi-ms-win-core-io-l1-1-1.a
-ADDLIB lib64/libapi-ms-win-core-kernel32-legacy-l1-1-1.a
-ADDLIB lib64/libapi-ms-win-core-largeinteger-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-libraryloader-l1-2-0.a
-ADDLIB lib64/libapi-ms-win-core-libraryloader-l2-1-0.a
-ADDLIB lib64/libapi-ms-win-core-localization-ansi-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-localization-l1-2-1.a
-ADDLIB lib64/libapi-ms-win-core-localization-l1-2-2.a
-ADDLIB lib64/libapi-ms-win-core-localization-l2-1-0.a
-ADDLIB lib64/libapi-ms-win-core-memory-l1-1-2.a
-ADDLIB lib64/libapi-ms-win-core-memory-l1-1-3.a
-ADDLIB lib64/libapi-ms-win-core-normalization-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-processenvironment-l1-2-0.a
-ADDLIB lib64/libapi-ms-win-core-processthreads-l1-1-2.a
-ADDLIB lib64/libapi-ms-win-core-processthreads-l1-1-3.a
-ADDLIB lib64/libapi-ms-win-core-profile-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-realtime-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-realtime-l1-1-1.a
-ADDLIB lib64/libapi-ms-win-core-rtlsupport-l1-2-0.a
-ADDLIB lib64/libapi-ms-win-core-string-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-synch-ansi-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-synch-l1-2-0.a
-ADDLIB lib64/libapi-ms-win-core-synch-l1-2-1.a
-ADDLIB lib64/libapi-ms-win-core-sysinfo-l1-2-1.a
-ADDLIB lib64/libapi-ms-win-core-sysinfo-l1-2-3.a
-ADDLIB lib64/libapi-ms-win-core-threadpool-l1-2-0.a
-ADDLIB lib64/libapi-ms-win-core-timezone-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-util-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-windowsceip-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-windowserrorreporting-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-winrt-error-l1-1-1.a
-ADDLIB lib64/libapi-ms-win-core-winrt-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-winrt-registration-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-winrt-robuffer-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-winrt-roparameterizediid-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-winrt-string-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-core-xstate-l2-1-0.a
-ADDLIB lib64/libapi-ms-win-eventing-classicprovider-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-eventing-consumer-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-eventing-controller-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-eventing-legacy-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-eventing-provider-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-gaming-tcui-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-ro-typeresolution-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-security-cryptoapi-l1-1-0.a
-ADDLIB lib64/libapi-ms-win-shcore-stream-winrt-l1-1-0.a
-SAVE
-END
diff --git a/mingw-w64-crt/libarm32/windowsapp.mri b/mingw-w64-crt/libarm32/windowsapp.mri
deleted file mode 100644
index 97ff15ac..00000000
--- a/mingw-w64-crt/libarm32/windowsapp.mri
+++ /dev/null
@@ -1,66 +0,0 @@
-CREATE libarm32/libwindowsapp.a
-ADDLIB libarm32/libapi-ms-win-core-com-l1-1-1.a
-ADDLIB libarm32/libapi-ms-win-core-com-l2-1-1.a
-ADDLIB libarm32/libapi-ms-win-core-com-midlproxystub-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-datetime-l1-1-1.a
-ADDLIB libarm32/libapi-ms-win-core-datetime-l1-1-2.a
-ADDLIB libarm32/libapi-ms-win-core-debug-l1-1-1.a
-ADDLIB libarm32/libapi-ms-win-core-delayload-l1-1-1.a
-ADDLIB libarm32/libapi-ms-win-core-errorhandling-l1-1-1.a
-ADDLIB libarm32/libapi-ms-win-core-errorhandling-l1-1-3.a
-ADDLIB libarm32/libapi-ms-win-core-fibers-l1-1-1.a
-ADDLIB libarm32/libapi-ms-win-core-fibers-l2-1-1.a
-ADDLIB libarm32/libapi-ms-win-core-file-ansi-l2-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-file-l1-2-1.a
-ADDLIB libarm32/libapi-ms-win-core-file-l2-1-1.a
-ADDLIB libarm32/libapi-ms-win-core-handle-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-heap-l1-2-0.a
-ADDLIB libarm32/libapi-ms-win-core-interlocked-l1-2-0.a
-ADDLIB libarm32/libapi-ms-win-core-io-l1-1-1.a
-ADDLIB libarm32/libapi-ms-win-core-kernel32-legacy-l1-1-1.a
-ADDLIB libarm32/libapi-ms-win-core-largeinteger-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-libraryloader-l1-2-0.a
-ADDLIB libarm32/libapi-ms-win-core-libraryloader-l2-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-localization-ansi-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-localization-l1-2-1.a
-ADDLIB libarm32/libapi-ms-win-core-localization-l1-2-2.a
-ADDLIB libarm32/libapi-ms-win-core-localization-l2-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-memory-l1-1-2.a
-ADDLIB libarm32/libapi-ms-win-core-memory-l1-1-3.a
-ADDLIB libarm32/libapi-ms-win-core-normalization-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-processenvironment-l1-2-0.a
-ADDLIB libarm32/libapi-ms-win-core-processthreads-l1-1-2.a
-ADDLIB libarm32/libapi-ms-win-core-processthreads-l1-1-3.a
-ADDLIB libarm32/libapi-ms-win-core-profile-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-realtime-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-realtime-l1-1-1.a
-ADDLIB libarm32/libapi-ms-win-core-rtlsupport-l1-2-0.a
-ADDLIB libarm32/libapi-ms-win-core-string-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-synch-ansi-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-synch-l1-2-0.a
-ADDLIB libarm32/libapi-ms-win-core-synch-l1-2-1.a
-ADDLIB libarm32/libapi-ms-win-core-sysinfo-l1-2-1.a
-ADDLIB libarm32/libapi-ms-win-core-sysinfo-l1-2-3.a
-ADDLIB libarm32/libapi-ms-win-core-threadpool-l1-2-0.a
-ADDLIB libarm32/libapi-ms-win-core-timezone-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-util-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-windowsceip-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-windowserrorreporting-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-winrt-error-l1-1-1.a
-ADDLIB libarm32/libapi-ms-win-core-winrt-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-winrt-registration-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-winrt-robuffer-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-winrt-roparameterizediid-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-winrt-string-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-core-xstate-l2-1-0.a
-ADDLIB libarm32/libapi-ms-win-eventing-classicprovider-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-eventing-consumer-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-eventing-controller-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-eventing-legacy-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-eventing-provider-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-gaming-tcui-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-ro-typeresolution-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-security-cryptoapi-l1-1-0.a
-ADDLIB libarm32/libapi-ms-win-shcore-stream-winrt-l1-1-0.a
-SAVE
-END
diff --git a/mingw-w64-crt/libarm64/windowsapp.mri b/mingw-w64-crt/libarm64/windowsapp.mri
deleted file mode 100644
index 487fb3e7..00000000
--- a/mingw-w64-crt/libarm64/windowsapp.mri
+++ /dev/null
@@ -1,66 +0,0 @@
-CREATE libarm64/libwindowsapp.a
-ADDLIB libarm64/libapi-ms-win-core-com-l1-1-1.a
-ADDLIB libarm64/libapi-ms-win-core-com-l2-1-1.a
-ADDLIB libarm64/libapi-ms-win-core-com-midlproxystub-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-datetime-l1-1-1.a
-ADDLIB libarm64/libapi-ms-win-core-datetime-l1-1-2.a
-ADDLIB libarm64/libapi-ms-win-core-debug-l1-1-1.a
-ADDLIB libarm64/libapi-ms-win-core-delayload-l1-1-1.a
-ADDLIB libarm64/libapi-ms-win-core-errorhandling-l1-1-1.a
-ADDLIB libarm64/libapi-ms-win-core-errorhandling-l1-1-3.a
-ADDLIB libarm64/libapi-ms-win-core-fibers-l1-1-1.a
-ADDLIB libarm64/libapi-ms-win-core-fibers-l2-1-1.a
-ADDLIB libarm64/libapi-ms-win-core-file-ansi-l2-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-file-l1-2-1.a
-ADDLIB libarm64/libapi-ms-win-core-file-l2-1-1.a
-ADDLIB libarm64/libapi-ms-win-core-handle-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-heap-l1-2-0.a
-ADDLIB libarm64/libapi-ms-win-core-interlocked-l1-2-0.a
-ADDLIB libarm64/libapi-ms-win-core-io-l1-1-1.a
-ADDLIB libarm64/libapi-ms-win-core-kernel32-legacy-l1-1-1.a
-ADDLIB libarm64/libapi-ms-win-core-largeinteger-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-libraryloader-l1-2-0.a
-ADDLIB libarm64/libapi-ms-win-core-libraryloader-l2-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-localization-ansi-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-localization-l1-2-1.a
-ADDLIB libarm64/libapi-ms-win-core-localization-l1-2-2.a
-ADDLIB libarm64/libapi-ms-win-core-localization-l2-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-memory-l1-1-2.a
-ADDLIB libarm64/libapi-ms-win-core-memory-l1-1-3.a
-ADDLIB libarm64/libapi-ms-win-core-normalization-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-processenvironment-l1-2-0.a
-ADDLIB libarm64/libapi-ms-win-core-processthreads-l1-1-2.a
-ADDLIB libarm64/libapi-ms-win-core-processthreads-l1-1-3.a
-ADDLIB libarm64/libapi-ms-win-core-profile-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-realtime-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-realtime-l1-1-1.a
-ADDLIB libarm64/libapi-ms-win-core-rtlsupport-l1-2-0.a
-ADDLIB libarm64/libapi-ms-win-core-string-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-synch-ansi-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-synch-l1-2-0.a
-ADDLIB libarm64/libapi-ms-win-core-synch-l1-2-1.a
-ADDLIB libarm64/libapi-ms-win-core-sysinfo-l1-2-1.a
-ADDLIB libarm64/libapi-ms-win-core-sysinfo-l1-2-3.a
-ADDLIB libarm64/libapi-ms-win-core-threadpool-l1-2-0.a
-ADDLIB libarm64/libapi-ms-win-core-timezone-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-util-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-windowsceip-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-windowserrorreporting-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-winrt-error-l1-1-1.a
-ADDLIB libarm64/libapi-ms-win-core-winrt-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-winrt-registration-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-winrt-robuffer-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-winrt-roparameterizediid-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-winrt-string-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-core-xstate-l2-1-0.a
-ADDLIB libarm64/libapi-ms-win-eventing-classicprovider-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-eventing-consumer-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-eventing-controller-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-eventing-legacy-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-eventing-provider-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-gaming-tcui-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-ro-typeresolution-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-security-cryptoapi-l1-1-0.a
-ADDLIB libarm64/libapi-ms-win-shcore-stream-winrt-l1-1-0.a
-SAVE
-END

_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to