Commit 417b6eb0 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

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.
parent 748c53a3
...@@ -64,7 +64,8 @@ libvlc_la_LDFLAGS = \ ...@@ -64,7 +64,8 @@ libvlc_la_LDFLAGS = \
libvlc_la_DEPENDENCIES = libvlc.sym libvlc_la_DEPENDENCIES = libvlc.sym
if HAVE_WIN32 if HAVE_WIN32
libvlc_la_DEPENDENCIES += ../src/libvlc_win32_rc.$(OBJEXT) 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 endif
if HAVE_OS2 if HAVE_OS2
libvlc_la_LDFLAGS += -avoid-version libvlc_la_LDFLAGS += -avoid-version
......
...@@ -33,7 +33,8 @@ AM_LDFLAGS = \ ...@@ -33,7 +33,8 @@ AM_LDFLAGS = \
-no-undefined \ -no-undefined \
$(top_builddir)/compat/libcompat.la $(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la $(LTLIBVLCCORE)
if HAVE_WIN32 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 endif
SUFFIXES = .asm SUFFIXES = .asm
......
...@@ -190,7 +190,8 @@ libvlccore_la_LIBADD = $(LIBS_libvlccore) \ ...@@ -190,7 +190,8 @@ libvlccore_la_LIBADD = $(LIBS_libvlccore) \
libvlccore_la_DEPENDENCIES = libvlccore.sym libvlccore_la_DEPENDENCIES = libvlccore.sym
if HAVE_WIN32 if HAVE_WIN32
libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT) 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 endif
if HAVE_OS2 if HAVE_OS2
libvlccore_la_LDFLAGS += -avoid-version libvlccore_la_LDFLAGS += -avoid-version
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment