Win32: prefer the static libraries when creating the dlls

This should avoid the issues of packaging libgcc_s_sjlj-1.dll,
libwinpthread-1.dll and the like.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index c53fe083894d930adfbc0148e5efbf2984d24ee1..be1b6beaf6f6d5f1eb98870a44444aae4e5690ec 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -64,7 +64,8 @@ libvlc_la_LDFLAGS = \
 libvlc_la_DEPENDENCIES = libvlc.sym
 if HAVE_WIN32
 libvlc_la_DEPENDENCIES += ../src/libvlc_win32_rc.$(OBJEXT)
-libvlc_la_LDFLAGS += -Wl,../src/libvlc_win32_rc.$(OBJEXT) -avoid-version
+libvlc_la_LDFLAGS += -Wl,../src/libvlc_win32_rc.$(OBJEXT) -avoid-version \
+                                        -Wc,--static -Wc,-static-libgcc
 endif
 if HAVE_OS2
 libvlc_la_LDFLAGS += -avoid-version

diff --git a/modules/common.am b/modules/common.am
index 9bb5143547c26e4e7ff6c65576b4e3f20f12025e..c3b3f8ef571bc35c3348f64a2b4149e7e89de6c0 100644 (file)
--- a/modules/common.am
+++ b/modules/common.am
@@ -33,7 +33,8 @@ AM_LDFLAGS = \
        -no-undefined \
        $(top_builddir)/compat/libcompat.la $(LTLIBVLCCORE) 
 if HAVE_WIN32
-AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo
+AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo \
+              -Wc,--static -Wc,-static-libgcc
 endif
 
 SUFFIXES = .asm

diff --git a/src/Makefile.am b/src/Makefile.am
index 1e113c9c42d7910296c5aaa102186b2a542e0e4c..4472271311f7e471f517e0ee1426f6c255edb161 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -190,7 +190,8 @@ libvlccore_la_LIBADD = $(LIBS_libvlccore) \
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
-libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version
+libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version \
+                                                -Wc,--static -Wc,-static-libgcc
 endif
 if HAVE_OS2
 libvlccore_la_LDFLAGS += -avoid-version