Skip to content

V
vlc-gpu
Commit 2f684f47 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix Mozilla plugin on ELF architectures

parent 81833785
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
mozilla/Makefile.am
View file @ 2f684f47
...@@ -27,9 +27,11 @@ DIST_misc = \ ...@@ -27,9 +27,11 @@ DIST_misc = \
$(NULL) $(NULL)
if BUILD_SHARED if BUILD_SHARED
LIBRARIES_libvlc = $(top_builddir)/src/libvlc$(LIBEXT) LIBRARIES_libvlc_pic = $(top_builddir)/src/libvlc$(LIBEXT)
LIBRARIES_libvlc_nopic = $(top_builddir)/src/libvlc$(LIBEXT)
else else
LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a LIBRARIES_libvlc_pic = $(top_builddir)/src/libvlc_pic.a
LIBRARIES_libvlc_nopic = $(top_builddir)/src/libvlc.a
endif endif
if BUILD_MOZILLA if BUILD_MOZILLA
...@@ -39,6 +41,7 @@ if BUILD_MOZILLA ...@@ -39,6 +41,7 @@ if BUILD_MOZILLA
# under Win32 and npunix.c under Unix. # under Win32 and npunix.c under Unix.
if HAVE_WIN32 if HAVE_WIN32
LIBRARIES_libvlc = $(LIBRARIES_libvlc_nopic)
npvlc_DATA = npvlc$(LIBEXT) npvlc_DATA = npvlc$(LIBEXT)
npvlcdir = $(libdir) npvlcdir = $(libdir)
...@@ -57,6 +60,8 @@ LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc) `$(VLC_CONFIG) --libs mozilla vlc bu ...@@ -57,6 +60,8 @@ LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc) `$(VLC_CONFIG) --libs mozilla vlc bu
else else
if HAVE_DARWIN if HAVE_DARWIN
LIBRARIES_libvlc = $(LIBRARIES_libvlc_nopic)
npvlc_DATA = npvlc$(LIBEXT) npvlc_DATA = npvlc$(LIBEXT)
npvlcdir = $(libdir) npvlcdir = $(libdir)
...@@ -90,6 +95,8 @@ VLC\ Plugin.plugin: npvlc.rsrc npvlc.dylib ...@@ -90,6 +95,8 @@ VLC\ Plugin.plugin: npvlc.rsrc npvlc.dylib
else else
LIBRARIES_libvlc = $(LIBRARIES_libvlc_pic)
npvlc_DATA = libvlcplugin$(LIBEXT) npvlc_DATA = libvlcplugin$(LIBEXT)
npvlcdir = $(libdir)/mozilla/plugins npvlcdir = $(libdir)/mozilla/plugins
......
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