From ba98f2bd51b7e1f7a7f5ca69807774894fd05e30 Mon Sep 17 00:00:00 2001 From: Damien Fouilleul Date: Fri, 18 Aug 2006 15:10:21 +0000 Subject: [PATCH] - fixed Cygwin issue when linking/building shared libvlc.dll --- bootstrap | 2 +- src/Makefile.am | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bootstrap b/bootstrap index f4e17d00c4..d7d603cfbb 100755 --- a/bootstrap +++ b/bootstrap @@ -216,7 +216,7 @@ include Modules.am LTLIBVLC = \$(top_builddir)/src/libvlc.la if BUILD_SHARED -LIBVLC = \$(top_builddir)/src/libvlc\$(LIBEXT) +LIBVLC = -L\$(top_builddir)/src -lvlc LIBADD = \$(LIBVLC) endif diff --git a/src/Makefile.am b/src/Makefile.am index 3172f7bed7..942e4ed972 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -190,10 +190,11 @@ endif if HAVE_WIN32 if BUILD_SHARED -DATA_noinst_libvlc = libvlc$(LIBEXT) +DATA_noinst_libvlc = libvlc$(LIBEXT) libvlc$(LIBEXT).a endif libvlc.dll.a: libvlc$(LIBEXT) + $(DLLTOOL) --export-all-symbols -l $@ -D $< $(libvlc_a_OBJECTS) libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins @ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin $(pic)` $(INCLUDED_LIBINTL)" ; \ @@ -204,12 +205,12 @@ libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins esac ; \ echo $$ld $(OBJECTS_libvlc_so) $(LDFLAGS_libvlc_so) $$ldfl; \ $$ld $(libvlc_a_OBJECTS) \ - -Wl,--out-implib,$(top_builddir)/src/libvlc.dll.a $$ldfl + $$ldfl # It sucks big time, but we have to do that to link vlc properly # on non-PIC OSes, otherwise ld will favor builtins-less libvlc.a over # libvlc$(LIBEXT) rm -f libvlc.a -# Cygwin work-around +# Cygwin libtool work-around @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi endif -- 2.39.2