56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From 4f1eb32c1664b305d246433583de5ef38629315b Mon Sep 17 00:00:00 2001
|
|
From: martell <martellmalone@gmail.com>
|
|
Date: Sat, 22 Nov 2014 22:15:37 +0000
|
|
Subject: [PATCH 4/7] Revert "Win32: prefer the static libraries when creating
|
|
the dlls"
|
|
|
|
This reverts commit 417b6eb0f09dc73984a7dba2aa42c9d8683d5294.
|
|
---
|
|
lib/Makefile.am | 2 +-
|
|
modules/common.am | 2 +-
|
|
src/Makefile.am | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/lib/Makefile.am b/lib/Makefile.am
|
|
index 892d9b14f1..5252d59e6a 100644
|
|
--- a/lib/Makefile.am
|
|
+++ b/lib/Makefile.am
|
|
@@ -65,7 +65,7 @@ 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 -Wc,-static
|
|
+libvlc_la_LDFLAGS += -Wl,../src/libvlc_win32_rc.$(OBJEXT) -avoid-version
|
|
endif
|
|
if HAVE_OS2
|
|
libvlc_la_LDFLAGS += -avoid-version
|
|
diff --git a/modules/common.am b/modules/common.am
|
|
index 1b9117c98d..30e30ca4ec 100644
|
|
--- a/modules/common.am
|
|
+++ b/modules/common.am
|
|
@@ -33,7 +33,7 @@ AM_LDFLAGS = \
|
|
-no-undefined \
|
|
$(top_builddir)/compat/libcompat.la $(LTLIBVLCCORE)
|
|
if HAVE_WIN32
|
|
-AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo -Wc,-static
|
|
+AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo
|
|
endif
|
|
AM_YFLAGS = -d
|
|
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index 044169156c..e961f7734d 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -472,7 +472,7 @@ libvlccore_la_LDFLAGS = \
|
|
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 -Wc,-static $(LIBCOM)
|
|
+libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version $(LIBCOM)
|
|
endif
|
|
if HAVE_OS2
|
|
libvlccore_la_LDFLAGS += -avoid-version
|
|
--
|
|
2.15.0
|
|
|