- fixed Cygwin issue when linking/building shared libvlc.dll

diff --git a/bootstrap b/bootstrap
index f4e17d00c45521bc59cf46a1648889575016913d..d7d603cfbb5610822d3b512efa23d2b80f661959 100755 (executable)
--- 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 3172f7bed7d14bdad612a5877c3176b4fa318c77..942e4ed9720f0c2c4546a9baec0294f554dd7163 100644 (file)
--- 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