Commit 81c1cc5e authored by Damien Fouilleul's avatar Damien Fouilleul

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

all: for WIN32, create an import library libvlc-dll.a when linking libvlc.dll; updating linking for vlc.exe and activex.dll to use import library in place of dll.
parent f318ceca
......@@ -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`
......
......@@ -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
......
......@@ -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)
......
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