Using a single .def file seems to make the WACK confused
---
mingw-w64-crt/Makefile.am | 19 +++++++++++--------
mingw-w64-crt/lib32/Makefile.am | 3 +--
mingw-w64-crt/lib32/runtimeobject.mri | 5 +++++
mingw-w64-crt/lib64/runtimeobject.mri | 5 +++++
mingw-w64-crt/winrt/libruntimeobject.a | 2 --
5 files changed, 22 insertions(+), 12 deletions(-)
create mode 100644 mingw-w64-crt/lib32/runtimeobject.mri
create mode 100644 mingw-w64-crt/lib64/runtimeobject.mri
delete mode 100644 mingw-w64-crt/winrt/libruntimeobject.a
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 9281d74..daf25b0 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -403,9 +403,6 @@ src_intrincs32=\
# these only go into the ARM32 version:
src_intrincsarm32=
-winrtlibs=\
- winrt/libruntimeobject.a
-
if LIB32
#########
# Compiling 32-bit runtime
@@ -640,6 +637,11 @@ lib32/libvfw32.a: lib32/vfw32.mri lib32/libmsvfw32.a
lib32/libavifil32.a lib32/l
$(AR) -M < $<
$(RANLIB) $@
+lib32/libruntimeobject.a: lib32/runtimeobject.mri
lib32/libapi-ms-win-core-winrt-string-l1-1-0.a
lib32/libapi-ms-win-core-winrt-l1-1-0.a
+ rm -f $@
+ $(AR) -M < $<
+ $(RANLIB) $@
+
dx32_DATA =
dx32_DATA += lib32/libxinput.a
dx32_DATA += lib32/libxapofx.a
@@ -683,8 +685,6 @@ crt64dir=$(lib64dir)
winrt64dir=$(lib64dir)
dx64dir=$(lib64dir)
-winrt64_DATA = $(winrtlibs)
-
if !W32API
crt64_DATA = \
lib64/crt1.o lib64/crt2.o lib64/crt1u.o lib64/crt2u.o
lib64/dllcrt1.o lib64/dllcrt2.o \
@@ -1145,8 +1145,7 @@ lib64_DATA = \
lib64/libxaudio2_8.a lib64/libd3dcompiler_46.a lib64/libd3dcsx_46.a \
lib64/libd3d11.a lib64/libd3dcompiler_47.a \
lib64/libwinhttp.a \
- lib64/libapi-ms-win-core-winrt-string-l1-1-0.a \
- lib64/libapi-ms-win-core-winrt-l1-1-0.a
+ lib64/libruntimeobject.a
if !W32API
lib64_DATA += lib64/libmsvcp60.a lib64/libmsvcr80.a lib64/libmsvcr90.a
lib64/libmsvcr100.a lib64/libmsvcr90d.a \
@@ -1169,6 +1168,11 @@ lib64/libvfw32.a: lib64/vfw32.mri lib64/libmsvfw32.a
lib64/libavifil32.a lib64/l
$(AR) -M < $<
$(RANLIB) $@
+lib64/libruntimeobject.a: lib64/runtimeobject.mri
lib64/libapi-ms-win-core-winrt-string-l1-1-0.a
lib64/libapi-ms-win-core-winrt-l1-1-0.a
+ rm -f $@
+ $(AR) -M < $<
+ $(RANLIB) $@
+
dx64_DATA =
dx64_DATA += lib64/libxinput.a
dx64_DATA += lib64/libxapofx.a
@@ -1471,7 +1475,6 @@ EXTRA_DIST += revstamp.h \
$(top_srcdir)/lib32/*.def.in \
$(top_srcdir)/lib64/*.def.in \
$(top_srcdir)/def-include/*.def.in \
- $(top_srcdir)/$(winrtlibs) \
crt/binmode.c \
crt/crtbegin.c \
crt/crtdll.c \
diff --git a/mingw-w64-crt/lib32/Makefile.am b/mingw-w64-crt/lib32/Makefile.am
index 6b4ebea..3182cca 100644
--- a/mingw-w64-crt/lib32/Makefile.am
+++ b/mingw-w64-crt/lib32/Makefile.am
@@ -4,8 +4,7 @@ lib32_DATA += %reldir%/libactiveds.a
lib32_DATA += %reldir%/libadsldpc.a
lib32_DATA += %reldir%/libadvapi32.a
lib32_DATA += %reldir%/libapcups.a
-lib32_DATA += %reldir%/libapi-ms-win-core-winrt-l1-1-0.a
-lib32_DATA += %reldir%/libapi-ms-win-core-winrt-string-l1-1-0.a
+lib32_DATA += %reldir%/libruntimeobject.a
lib32_DATA += %reldir%/libauthz.a
lib32_DATA += %reldir%/libavicap32.a
lib32_DATA += %reldir%/libavifil32.a
diff --git a/mingw-w64-crt/lib32/runtimeobject.mri
b/mingw-w64-crt/lib32/runtimeobject.mri
new file mode 100644
index 0000000..8b9a7fd
--- /dev/null
+++ b/mingw-w64-crt/lib32/runtimeobject.mri
@@ -0,0 +1,5 @@
+CREATE lib32/libruntimeobject.a
+ADDLIB lib32/libapi-ms-win-core-winrt-string-l1-1-0.a
+ADDLIB lib32/libapi-ms-win-core-winrt-l1-1-0.a
+SAVE
+END
diff --git a/mingw-w64-crt/lib64/runtimeobject.mri
b/mingw-w64-crt/lib64/runtimeobject.mri
new file mode 100644
index 0000000..b34cd42
--- /dev/null
+++ b/mingw-w64-crt/lib64/runtimeobject.mri
@@ -0,0 +1,5 @@
+CREATE lib64/libruntimeobject.a
+ADDLIB lib64/libapi-ms-win-core-winrt-string-l1-1-0.a
+ADDLIB lib64/libapi-ms-win-core-winrt-l1-1-0.a
+SAVE
+END
diff --git a/mingw-w64-crt/winrt/libruntimeobject.a
b/mingw-w64-crt/winrt/libruntimeobject.a
deleted file mode 100644
index bc33fdd..0000000
--- a/mingw-w64-crt/winrt/libruntimeobject.a
+++ /dev/null
@@ -1,2 +0,0 @@
-INPUT(libapi-ms-win-core-winrt-string-l1-1-0.a)
-INPUT(libapi-ms-win-core-winrt-l1-1-0.a)
--
2.8.0.rc3
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
