Commit 06cc669a authored by Damien Fouilleul's avatar Damien Fouilleul

all: renamed DLL import library as libvlc.dll.a, as this is what mingw/cygwin...

all: renamed DLL import library as libvlc.dll.a, as this is what mingw/cygwin ld expects to see. for more info refer to: http://www.sourceware.org/binutils/docs-2.16/ld/WIN32.html
parent 318d39ac
......@@ -230,12 +230,12 @@ vlc_LDADD = $(DATA_win32_rc) $(INCLUDED_LIBINTL)
DEPENDENCIES_vlc = $(LIB_libvlc) $(DATA_win32_rc)
if BUILD_SHARED
vlc_LDFLAGS += `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc
if HAVE_WIN32
vlc_LDFLAGS += `$(VLC_CONFIG) --libs vlc` -L$(top_builddir)/src -lvlc-dll
LIB_libvlc = src/libvlc.dll.a
else
vlc_LDFLAGS += `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -Lsrc -lvlc
endif
LIB_libvlc = src/libvlc$(LIBEXT)
endif
else
vlc_LDFLAGS += `$(VLC_CONFIG) --libs vlc builtin`
vlc_LDADD += $(LIB_libvlc)
......
......@@ -60,7 +60,7 @@ DIST_misc = \
$(NULL)
if BUILD_SHARED
LIBRARIES_libvlc = $(top_builddir)/src/libvlc-dll.a
LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll.a
else
LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a
endif
......
......@@ -188,7 +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
LDFLAGS_libvlc_so = -Wl,--out-implib,$(top_builddir)/src/libvlc.dll.a
else
OBJECTS_libvlc_so = $(libvlc_pic_a_OBJECTS)
endif
......
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