crt: add missing apiset exports to runtimeobject library
also move the related _DATA variable to libarm32/Makefile.am
Signed-off-by: Biswapriyo Nath <nathbappai@gmail.com>
Signed-off-by: Liu Hao <lh_mouse@126.com>
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 7f036f6..e0681cb 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -1524,7 +1524,6 @@
dx32_DATA =
dx32_DATA += libarm32/libxinput.a
dx32_DATA += libarm32/libd3dcompiler.a
-libarm32_DATA += libarm32/libruntimeobject.a libarm32/libsynchronization.a
libarm32/libxinput.a: lib-common/xinput1_4.def
$(DTDEFARM32) $<
@@ -1789,7 +1788,6 @@
dx64_DATA =
dx64_DATA += libarm64/libxinput.a
dx64_DATA += libarm64/libd3dcompiler.a
-#libarm64_DATA += libarm64/libruntimeobject.a libarm64/libsynchronization.a
libarm64/libxinput.a: lib-common/xinput1_4.def
$(DTDEFARM64) $<
@@ -1926,7 +1924,12 @@
%/libruntimeobject.a: lib-common/runtimeobject.mri \
%/libapi-ms-win-core-winrt-l1-1-0.a \
%/libapi-ms-win-core-winrt-error-l1-1-0.a \
- %/libapi-ms-win-core-winrt-string-l1-1-0.a
+ %/libapi-ms-win-core-winrt-error-l1-1-1.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-ro-typeresolution-l1-1-0.a
rm -f $@
cd $(dir $@) && $(AR) -M < $(abspath $<)
$(RANLIB) $@
diff --git a/mingw-w64-crt/lib-common/runtimeobject.mri b/mingw-w64-crt/lib-common/runtimeobject.mri
index 2264a69..6840987 100644
--- a/mingw-w64-crt/lib-common/runtimeobject.mri
+++ b/mingw-w64-crt/lib-common/runtimeobject.mri
@@ -1,6 +1,11 @@
CREATE libruntimeobject.a
ADDLIB libapi-ms-win-core-winrt-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-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-ro-typeresolution-l1-1-0.a
SAVE
END
diff --git a/mingw-w64-crt/libarm32/Makefile.am b/mingw-w64-crt/libarm32/Makefile.am
index c755586..b08b1ed 100644
--- a/mingw-w64-crt/libarm32/Makefile.am
+++ b/mingw-w64-crt/libarm32/Makefile.am
@@ -647,6 +647,7 @@
libarm32_DATA += %reldir%/librstrtmgr.a
libarm32_DATA += %reldir%/librtutils.a
libarm32_DATA += %reldir%/librtworkq.a
+libarm32_DATA += %reldir%/libruntimeobject.a
libarm32_DATA += %reldir%/libsamcli.a
libarm32_DATA += %reldir%/libsamlib.a
libarm32_DATA += %reldir%/libsamsrv.a
@@ -758,6 +759,7 @@
libarm32_DATA += %reldir%/libsxshared.a
libarm32_DATA += %reldir%/libsxssrv.a
libarm32_DATA += %reldir%/libsxsstore.a
+libarm32_DATA += %reldir%/libsynchronization.a
libarm32_DATA += %reldir%/libsysclass.a
libarm32_DATA += %reldir%/libsysmain.a
libarm32_DATA += %reldir%/libsysntfy.a
