all: for WIN32, create an import library libvlc-dll.a when linking libvlc.dll; updati...

diff --git a/Makefile.am b/Makefile.am
index cbf9375d684630d040323851d9304eacfa19f4ae..ba4aaa2e4c549578c72226f63fec138b45281401 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -230,7 +230,11 @@ vlc_LDADD = $(DATA_win32_rc) $(INCLUDED_LIBINTL)
 DEPENDENCIES_vlc = $(LIB_libvlc) $(DATA_win32_rc)
 
 if BUILD_SHARED
+if HAVE_WIN32
+vlc_LDFLAGS += `$(VLC_CONFIG) --libs vlc` -L$(top_builddir)/src -lvlc-dll
+else
 vlc_LDFLAGS += `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -Lsrc -lvlc
+endif
 LIB_libvlc = src/libvlc$(LIBEXT)
 else
 vlc_LDFLAGS += `$(VLC_CONFIG) --libs vlc builtin`

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 906ca553354b8b2853a4360e861e885dfce76d78..505d8fd2c632d1c2cb44ccad7566e3b9d804c04a 100644 (file)
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -59,7 +59,11 @@ DIST_misc = \
     test.html \
     $(NULL)
 
+if BUILD_SHARED
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc-dll.a
+else
 LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a
+endif
 
 if BUILD_ACTIVEX
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 7e6412c02babc4a86db86134f6835c14dc92ba90..f1e527bc8b1a7883846ba3c287ed5dd66ad9cfdf 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -188,6 +188,7 @@ if BUILD_SHARED
 DATA_noinst_libvlc = libvlc$(LIBEXT)
 if HAVE_WIN32
 OBJECTS_libvlc_so = $(libvlc_a_OBJECTS)
+LDFLAGS_libvlc_so = -Wl,--out-implib,$(top_builddir)/lib/libvlc-dll.a
 else
 OBJECTS_libvlc_so = $(libvlc_pic_a_OBJECTS)
 endif
@@ -200,8 +201,8 @@ libvlc$(LIBEXT): $(OBJECTS_libvlc_so) $(do_builtins)
          objc) ld="$(OBJCLINK)" ;; \
          c|*)  ld="$(LINK)" ;; \
        esac ; \
-       echo $$ld $(OBJECTS_libvlc_so) $$ldfl ; \
-       $$ld $(OBJECTS_libvlc_so) $$ldfl
+       echo $$ld $(OBJECTS_libvlc_so) $(LDFLAGS_libvlc_so) $$ldfl; \
+       $$ld $(OBJECTS_libvlc_so) $(LDFLAGS_libvlc_so) $$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)