Signed-off-by: Jacek Caban <ja...@codeweavers.com>
---
mingw-w64-crt/Makefile.am | 45
+++++++-------------------------------
mingw-w64-crt/lib-common/vfw32.mri | 6 +++++
mingw-w64-crt/lib32/vfw32.mri | 6 -----
mingw-w64-crt/lib64/vfw32.mri | 6 -----
4 files changed, 14 insertions(+), 49 deletions(-)
create mode 100644 mingw-w64-crt/lib-common/vfw32.mri
delete mode 100644 mingw-w64-crt/lib32/vfw32.mri
delete mode 100644 mingw-w64-crt/lib64/vfw32.mri
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 3a5690d9..434b9b06 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -749,15 +749,6 @@ lib32/lib%.a: lib32/%.def
lib32/lib%.a: lib-common/%.def
$(DTDEF32) $<
-# libvfw32.a contains import stubs for 3 dll's. Using an MRI script
-# seems to be the simplest way to combine them into one archive.
-# NB: With older dlltool, the object file members will not have unique
-# names.
-lib32/libvfw32.a: lib32/vfw32.mri lib32/libmsvfw32.a lib32/libavifil32.a lib32/libavicap32.a
- rm -f $@
- $(AR) -M < $<
- $(RANLIB) $@
-
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 \
@@ -1122,15 +1113,6 @@ lib64/lib%.a: lib64/%.def
lib64/lib%.a: lib-common/%.def
$(DTDEF64) $<
-# libvfw32.a contains import stubs for 3 dll's. Using an MRI script
-# seems to be the simplest way to combine them into one archive.
-# NB: With older dlltool, the object file members will not have unique
-# names.
-lib64/libvfw32.a: lib64/vfw32.mri lib64/libmsvfw32.a lib64/libavifil32.a lib64/libavicap32.a
- rm -f $@
- $(AR) -M < $<
- $(RANLIB) $@
-
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 \
@@ -1439,15 +1421,6 @@ libarm32/lib%.a: libarm32/%.def
libarm32/lib%.a: lib-common/%.def
$(DTDEFARM32) $<
-# libvfw32.a contains import stubs for 3 dll's. Using an MRI script
-# seems to be the simplest way to combine them into one archive.
-# NB: With older dlltool, the object file members will not have unique
-# names.
-libarm32/libvfw32.a: libarm32/vfw32.mri libarm32/libmsvfw32.a libarm32/libavifil32.a libarm32/libavicap32.a
- rm -f $@
- $(AR) -M < $<
- $(RANLIB) $@
-
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 \
@@ -1730,16 +1703,6 @@ libarm64/lib%.a: libarm64/%.def
libarm64/lib%.a: lib-common/%.def
$(DTDEFARM64) $<
-# libvfw32.a contains import stubs for 3 dll's. Using an MRI script
-# seems to be the simplest way to combine them into one archive.
-# NB: With older dlltool, the object file members will not have unique
-# names.
-# TODO: These libraries files aren't yet built for arm64.
-libarm64/libvfw32.a: libarm64/vfw32.mri libarm64/libmsvfw32.a libarm64/libavifil32.a libarm64/libavicap32.a
- rm -f $@
- $(AR) -M < $<
- $(RANLIB) $@
-
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 \
@@ -1871,6 +1834,14 @@ endif
cd $(dir $@) && $(AR) -M < $(abspath $<)
$(RANLIB) $@
+%/libvfw32.a: lib-common/vfw32.mri \
+ %/libmsvfw32.a \
+ %/libavifil32.a \
+ %/libavicap32.a
+ rm -f $@
+ cd $(dir $@) && $(AR) -M < $(abspath $<)
+ $(RANLIB) $@
+
%.def: %.def.in
$(MKDIR_P) $(@D) && $(CPP) -x c $< -Wp,-w -undef -P -I$(top_srcdir)/def-include > $@
diff --git a/mingw-w64-crt/lib-common/vfw32.mri b/mingw-w64-crt/lib-common/vfw32.mri
new file mode 100644
index 00000000..ee01b122
--- /dev/null
+++ b/mingw-w64-crt/lib-common/vfw32.mri
@@ -0,0 +1,6 @@
+CREATE libvfw32.a
+ADDLIB libmsvfw32.a
+ADDLIB libavicap32.a
+ADDLIB libavifil32.a
+SAVE
+END
diff --git a/mingw-w64-crt/lib32/vfw32.mri b/mingw-w64-crt/lib32/vfw32.mri
deleted file mode 100644
index ccce7583..00000000
--- a/mingw-w64-crt/lib32/vfw32.mri
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE lib32/libvfw32.a
-ADDLIB lib32/libmsvfw32.a
-ADDLIB lib32/libavicap32.a
-ADDLIB lib32/libavifil32.a
-SAVE
-END
diff --git a/mingw-w64-crt/lib64/vfw32.mri b/mingw-w64-crt/lib64/vfw32.mri
deleted file mode 100644
index 9aa07f9a..00000000
--- a/mingw-w64-crt/lib64/vfw32.mri
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE lib64/libvfw32.a
-ADDLIB lib64/libmsvfw32.a
-ADDLIB lib64/libavicap32.a
-ADDLIB lib64/libavifil32.a
-SAVE
-END
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
