Commit 67561f25 authored by Damien Fouilleul's avatar Damien Fouilleul

- add libvlc.a at the end of the linking chain, so that --disable-plugins...

- add libvlc.a at the end of the linking chain, so that --disable-plugins works for the ActiveX Plugin (ref. #276)
parent d6205362
......@@ -67,7 +67,7 @@ noinst_LIBRARIES_activex = libaxvlc.a
axvlc_DATA = axvlc$(LIBEXT)
axvlcdir = $(libdir)
LDFLAGS_activex = `$(VLC_CONFIG) --libs vlc activex builtin`
LDFLAGS_activex = `$(VLC_CONFIG) --libs activex vlc builtin`
libaxvlc_a_SOURCES = $(SOURCES_activex) $(SOURCE_dll)
libaxvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags activex`
......@@ -78,7 +78,7 @@ axvlc$(LIBEXT): $(libaxvlc_a_OBJECTS) \
$(libaxvlc_a_DEPENDENCIES) stamp-pic
$(CXXLINK) $(libaxvlc_a_OBJECTS) $(DATA_axvlc_rc) \
-Wl,--enable-stdcall-fixup $(srcdir)/axvlc.def \
$(LIBRARIES_libvlc) -shared $(LDFLAGS_activex)
$(LIBRARIES_libvlc) -shared $(LDFLAGS_activex) $(LIBRARIES_libvlc)
DATA_axvlc_tlb = $(axvlc_tlb_DATA)
......
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