Note that this isn't yet exhaustive. Notably the official versions of
onecore, onecoreuap, and windowscoreheadless all include cut-down
versions of user32 etc., which I'm going to handle with a later patch.
Signed-off-by: Mark Harmstone <m...@harmstone.com>
---
mingw-w64-crt/Makefile.am | 99 ++++++++++++++++++++++++++++
mingw-w64-crt/lib-common/onecore.mri | 97 +++++++++++++++++++++++++++
mingw-w64-crt/lib32/Makefile.am | 1 +
mingw-w64-crt/lib64/Makefile.am | 1 +
mingw-w64-crt/libarm32/Makefile.am | 1 +
mingw-w64-crt/libarm64/Makefile.am | 1 +
6 files changed, 200 insertions(+)
create mode 100644 mingw-w64-crt/lib-common/onecore.mri
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 524fece2f..5e41cab36 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -2403,6 +2403,105 @@ endif
cd $(dir $@) && $(AR) -M < $(abspath $<)
$(RANLIB) $@
+%/libonecore.a: lib-common/onecore.mri \
+ %/libapi-ms-win-core-backgroundtask-l1-1-0.a \
+ %/libapi-ms-win-core-calendar-l1-1-0.a \
+ %/libapi-ms-win-core-comm-l1-1-1.a \
+ %/libapi-ms-win-core-comm-l1-1-2.a \
+ %/libapi-ms-win-core-debug-minidump-l1-1-0.a \
+ %/libapi-ms-win-core-enclave-l1-1-1.a \
+ %/libapi-ms-win-core-errorhandling-l1-1-3.a \
+ %/libapi-ms-win-core-featurestaging-l1-1-0.a \
+ %/libapi-ms-win-core-featurestaging-l1-1-1.a \
+ %/libapi-ms-win-core-handle-l1-1-0.a \
+ %/libapi-ms-win-core-libraryloader-l2-1-0.a \
+ %/libapi-ms-win-core-memory-l1-1-3.a \
+ %/libapi-ms-win-core-memory-l1-1-4.a \
+ %/libapi-ms-win-core-memory-l1-1-5.a \
+ %/libapi-ms-win-core-memory-l1-1-6.a \
+ %/libapi-ms-win-core-memory-l1-1-7.a \
+ %/libapi-ms-win-core-path-l1-1-0.a \
+ %/libapi-ms-win-core-quirks-l1-1-0.a \
+ %/libapi-ms-win-core-quirks-l1-1-1.a \
+ %/libapi-ms-win-core-realtime-l1-1-1.a \
+ %/libapi-ms-win-core-realtime-l1-1-2.a \
+ %/libapi-ms-win-core-rtlsupport-l1-1-0.a \
+ %/libapi-ms-win-core-rtlsupport-l1-2-0.a \
+ %/libapi-ms-win-core-state-helpers-l1-1-0.a \
+ %/libapi-ms-win-core-synch-l1-2-0.a \
+ %/libapi-ms-win-core-sysinfo-l1-2-0.a \
+ %/libapi-ms-win-core-sysinfo-l1-2-3.a \
+ %/libapi-ms-win-core-sysinfo-l1-2-4.a \
+ %/libapi-ms-win-core-util-l1-1-1.a \
+ %/libapi-ms-win-core-windowserrorreporting-l1-1-0.a \
+ %/libapi-ms-win-core-winrt-error-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-winrt-string-l1-1-1.a \
+ %/libapi-ms-win-core-wow64-l1-1-1.a \
+ %/libapi-ms-win-devices-config-l1-1-1.a \
+ %/libapi-ms-win-devices-query-l1-1-0.a \
+ %/libapi-ms-win-devices-query-l1-1-1.a \
+ %/libapi-ms-win-devices-swdevice-l1-1-0.a \
+ %/libapi-ms-win-devices-swdevice-l1-1-1.a \
+ %/libapi-ms-win-gaming-deviceinformation-l1-1-0.a \
+ %/libapi-ms-win-power-base-l1-1-0.a \
+ %/libapi-ms-win-power-limitsmanagement-l1-1-0.a \
+ %/libapi-ms-win-power-setting-l1-1-0.a \
+ %/libapi-ms-win-power-setting-l1-1-1.a \
+ %/libapi-ms-win-ro-typeresolution-l1-1-0.a \
+ %/libapi-ms-win-ro-typeresolution-l1-1-1.a \
+ %/libapi-ms-win-security-base-l1-2-2.a \
+ %/libapi-ms-win-security-isolatedcontainer-l1-1-0.a \
+ %/libapi-ms-win-security-isolatedcontainer-l1-1-1.a \
+ %/libapi-ms-win-service-core-l1-1-3.a \
+ %/libapi-ms-win-service-core-l1-1-4.a \
+ %/libapi-ms-win-shcore-scaling-l1-1-0.a \
+ %/libapi-ms-win-shcore-scaling-l1-1-1.a \
+ %/libapi-ms-win-shcore-scaling-l1-1-2.a \
+ %/libapi-ms-win-shcore-stream-winrt-l1-1-0.a \
+ %/libauthz.a \
+ %/libbcrypt.a \
+ %/libcabinet.a \
+ %/libcomdlg32.a \
+ %/libcrypt32.a \
+ %/libcryptnet.a \
+ %/libdfscli.a \
+ %/libdhcpcsvc.a \
+ %/libdhcpcsvc6.a \
+ %/libdiagnosticdataquery.a \
+ %/libdnsapi.a \
+ %/libdsrole.a \
+ %/libfltlib.a \
+ %/libfontsub.a \
+ %/libiphlpapi.a \
+ %/liblogoncli.a \
+ %/libmpr.a \
+ %/libmswsock.a \
+ %/libnetutils.a \
+ %/liboleaut32.a \
+ %/libpsapi.a \
+ %/librpcrt4.a \
+ %/libsamcli.a \
+ %/libschedcli.a \
+ %/libshlwapi.a \
+ %/libsrvcli.a \
+ %/libsspicli.a \
+ %/libuserenv.a \
+ %/libversion.a \
+ %/libwebsocket.a \
+ %/libwkscli.a \
+ %/libwldap32.a \
+ %/libws2_32.a \
+ %/libxmllite.a
+ rm -f $@
+ cd $(dir $@) && $(AR) -M < $(abspath $<)
+ $(RANLIB) $@
+
%/libonecore_apiset.a: lib-common/onecore_apiset.mri \
%/libapi-ms-win-core-apiquery-l2-1-0.a \
%/libapi-ms-win-core-atoms-l1-1-0.a \
diff --git a/mingw-w64-crt/lib-common/onecore.mri
b/mingw-w64-crt/lib-common/onecore.mri
new file mode 100644
index 000000000..65602ed1d
--- /dev/null
+++ b/mingw-w64-crt/lib-common/onecore.mri
@@ -0,0 +1,97 @@
+CREATE libonecore.a
+ADDLIB libapi-ms-win-core-backgroundtask-l1-1-0.a
+ADDLIB libapi-ms-win-core-calendar-l1-1-0.a
+ADDLIB libapi-ms-win-core-comm-l1-1-1.a
+ADDLIB libapi-ms-win-core-comm-l1-1-2.a
+ADDLIB libapi-ms-win-core-debug-minidump-l1-1-0.a
+ADDLIB libapi-ms-win-core-enclave-l1-1-1.a
+ADDLIB libapi-ms-win-core-errorhandling-l1-1-3.a
+ADDLIB libapi-ms-win-core-featurestaging-l1-1-0.a
+ADDLIB libapi-ms-win-core-featurestaging-l1-1-1.a
+ADDLIB libapi-ms-win-core-handle-l1-1-0.a
+ADDLIB libapi-ms-win-core-libraryloader-l2-1-0.a
+ADDLIB libapi-ms-win-core-memory-l1-1-3.a
+ADDLIB libapi-ms-win-core-memory-l1-1-4.a
+ADDLIB libapi-ms-win-core-memory-l1-1-5.a
+ADDLIB libapi-ms-win-core-memory-l1-1-6.a
+ADDLIB libapi-ms-win-core-memory-l1-1-7.a
+ADDLIB libapi-ms-win-core-path-l1-1-0.a
+ADDLIB libapi-ms-win-core-quirks-l1-1-0.a
+ADDLIB libapi-ms-win-core-quirks-l1-1-1.a
+ADDLIB libapi-ms-win-core-realtime-l1-1-1.a
+ADDLIB libapi-ms-win-core-realtime-l1-1-2.a
+ADDLIB libapi-ms-win-core-rtlsupport-l1-1-0.a
+ADDLIB libapi-ms-win-core-rtlsupport-l1-2-0.a
+ADDLIB libapi-ms-win-core-state-helpers-l1-1-0.a
+ADDLIB libapi-ms-win-core-synch-l1-2-0.a
+ADDLIB libapi-ms-win-core-sysinfo-l1-2-0.a
+ADDLIB libapi-ms-win-core-sysinfo-l1-2-3.a
+ADDLIB libapi-ms-win-core-sysinfo-l1-2-4.a
+ADDLIB libapi-ms-win-core-util-l1-1-1.a
+ADDLIB libapi-ms-win-core-windowserrorreporting-l1-1-0.a
+ADDLIB libapi-ms-win-core-winrt-error-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-winrt-string-l1-1-1.a
+ADDLIB libapi-ms-win-core-wow64-l1-1-1.a
+ADDLIB libapi-ms-win-devices-config-l1-1-1.a
+ADDLIB libapi-ms-win-devices-query-l1-1-0.a
+ADDLIB libapi-ms-win-devices-query-l1-1-1.a
+ADDLIB libapi-ms-win-devices-swdevice-l1-1-0.a
+ADDLIB libapi-ms-win-devices-swdevice-l1-1-1.a
+ADDLIB libapi-ms-win-gaming-deviceinformation-l1-1-0.a
+ADDLIB libapi-ms-win-power-base-l1-1-0.a
+ADDLIB libapi-ms-win-power-limitsmanagement-l1-1-0.a
+ADDLIB libapi-ms-win-power-setting-l1-1-0.a
+ADDLIB libapi-ms-win-power-setting-l1-1-1.a
+ADDLIB libapi-ms-win-ro-typeresolution-l1-1-0.a
+ADDLIB libapi-ms-win-ro-typeresolution-l1-1-1.a
+ADDLIB libapi-ms-win-security-base-l1-2-2.a
+ADDLIB libapi-ms-win-security-isolatedcontainer-l1-1-0.a
+ADDLIB libapi-ms-win-security-isolatedcontainer-l1-1-1.a
+ADDLIB libapi-ms-win-service-core-l1-1-3.a
+ADDLIB libapi-ms-win-service-core-l1-1-4.a
+ADDLIB libapi-ms-win-shcore-scaling-l1-1-0.a
+ADDLIB libapi-ms-win-shcore-scaling-l1-1-1.a
+ADDLIB libapi-ms-win-shcore-scaling-l1-1-2.a
+ADDLIB libapi-ms-win-shcore-stream-winrt-l1-1-0.a
+ADDLIB libauthz.a
+ADDLIB libbcrypt.a
+ADDLIB libcabinet.a
+ADDLIB libcomdlg32.a
+ADDLIB libcrypt32.a
+ADDLIB libcryptnet.a
+ADDLIB libdfscli.a
+ADDLIB libdhcpcsvc.a
+ADDLIB libdhcpcsvc6.a
+ADDLIB libdiagnosticdataquery.a
+ADDLIB libdnsapi.a
+ADDLIB libdsrole.a
+ADDLIB libfltlib.a
+ADDLIB libfontsub.a
+ADDLIB libiphlpapi.a
+ADDLIB liblogoncli.a
+ADDLIB libmpr.a
+ADDLIB libmswsock.a
+ADDLIB libnetutils.a
+ADDLIB liboleaut32.a
+ADDLIB libpsapi.a
+ADDLIB librpcrt4.a
+ADDLIB libsamcli.a
+ADDLIB libschedcli.a
+ADDLIB libshlwapi.a
+ADDLIB libsrvcli.a
+ADDLIB libsspicli.a
+ADDLIB libuserenv.a
+ADDLIB libversion.a
+ADDLIB libwebsocket.a
+ADDLIB libwkscli.a
+ADDLIB libwldap32.a
+ADDLIB libws2_32.a
+ADDLIB libxmllite.a
+SAVE
+END
diff --git a/mingw-w64-crt/lib32/Makefile.am b/mingw-w64-crt/lib32/Makefile.am
index 83fcb2974..a2e01a809 100644
--- a/mingw-w64-crt/lib32/Makefile.am
+++ b/mingw-w64-crt/lib32/Makefile.am
@@ -227,6 +227,7 @@ lib32_DATA += %reldir%/libolepro32.a
lib32_DATA += %reldir%/libolesvr32.a
lib32_DATA += %reldir%/libolethk32.a
lib32_DATA += %reldir%/libonecore_apiset.a
+lib32_DATA += %reldir%/libonecore.a
lib32_DATA += %reldir%/libopends60.a
lib32_DATA += %reldir%/libopengl32.a
lib32_DATA += %reldir%/libp2p.a
diff --git a/mingw-w64-crt/lib64/Makefile.am b/mingw-w64-crt/lib64/Makefile.am
index fa53c2060..26c8d1947 100644
--- a/mingw-w64-crt/lib64/Makefile.am
+++ b/mingw-w64-crt/lib64/Makefile.am
@@ -458,6 +458,7 @@ lib64_DATA += %reldir%/liboledb32.a
lib64_DATA += %reldir%/liboledlg.a
lib64_DATA += %reldir%/libolesvr32.a
lib64_DATA += %reldir%/libonecore_apiset.a
+lib64_DATA += %reldir%/libonecore.a
lib64_DATA += %reldir%/libopends60.a
lib64_DATA += %reldir%/libopengl32.a
lib64_DATA += %reldir%/libosuninst.a
diff --git a/mingw-w64-crt/libarm32/Makefile.am
b/mingw-w64-crt/libarm32/Makefile.am
index 06a834340..3ef3d2b60 100644
--- a/mingw-w64-crt/libarm32/Makefile.am
+++ b/mingw-w64-crt/libarm32/Makefile.am
@@ -539,6 +539,7 @@ libarm32_DATA += %reldir%/liboleaut32.a
libarm32_DATA += %reldir%/liboledlg.a
libarm32_DATA += %reldir%/libondemandconnroutehelper.a
libarm32_DATA += %reldir%/libonecore_apiset.a
+libarm32_DATA += %reldir%/libonecore.a
libarm32_DATA += %reldir%/libonex.a
libarm32_DATA += %reldir%/libonexui.a
libarm32_DATA += %reldir%/liboobefldr.a
diff --git a/mingw-w64-crt/libarm64/Makefile.am
b/mingw-w64-crt/libarm64/Makefile.am
index ee20e35b2..6988880a5 100644
--- a/mingw-w64-crt/libarm64/Makefile.am
+++ b/mingw-w64-crt/libarm64/Makefile.am
@@ -221,6 +221,7 @@ libarm64_DATA += %reldir%/liboleacc.a
libarm64_DATA += %reldir%/liboleaut32.a
libarm64_DATA += %reldir%/liboledlg.a
libarm64_DATA += %reldir%/libonecore_apiset.a
+libarm64_DATA += %reldir%/libonecore.a
libarm64_DATA += %reldir%/libopengl32.a
libarm64_DATA += %reldir%/libosuninst.a
libarm64_DATA += %reldir%/libp2p.a
--
2.41.0
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
