Commit 51681a24 authored by Damien Fouilleul's avatar Damien Fouilleul

mozilla: libtool fixes (round 2: darwin)

parent 60a975f2
...@@ -71,8 +71,8 @@ CPPFLAGS_mozilla_EXTRA = -I. -I$(top_builddir) -I$(srcdir)/../include -c \ ...@@ -71,8 +71,8 @@ CPPFLAGS_mozilla_EXTRA = -I. -I$(top_builddir) -I$(srcdir)/../include -c \
-Wmost -Wno-four-char-constants -Wno-unknown-pragmas -DXP_MACOSX=1 \ -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -DXP_MACOSX=1 \
-DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 \ -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 \
-include mozilla-config.h -include mozilla-config.h
LDFLAGS_mozilla_EXTRA = -no-undefined -bundle -read_only_relocs suppress \ LDFLAGS_mozilla_EXTRA = -no-undefined -bundle -Wl,-read_only_relocs -Wl,suppress \
-dylib -headerpad_max_install_names -shrext $(LIBEXT) -Wl,-headerpad_max_install_names -shrext $(LIBEXT) -framework Carbon
npvlc_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support) npvlc_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support)
npvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` $(CPPFLAGS_mozilla_EXTRA) npvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` $(CPPFLAGS_mozilla_EXTRA)
...@@ -108,7 +108,7 @@ endef ...@@ -108,7 +108,7 @@ endef
VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES) VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES)
rm -Rf "$@" rm -Rf "$@"
$(INSTALL) -d "./$@/Contents/MacOS" $(INSTALL) -d "./$@/Contents/MacOS"
$(INSTALL) npvlc.dylib "./$@/Contents/MacOS/VLC Plugin" $(INSTALL) .libs/npvlc.dylib "./$@/Contents/MacOS/VLC Plugin"
dylib="./$@/Contents/MacOS/VLC Plugin"; $(FIXEXECPATH) ; dylib="./$@/Contents/MacOS/VLC Plugin"; $(FIXEXECPATH) ;
$(INSTALL) -d "./$@/Contents/Resources" $(INSTALL) -d "./$@/Contents/Resources"
$(INSTALL) npvlc.rsrc "./$@/Contents/Resources/VLC Plugin.rsrc" $(INSTALL) npvlc.rsrc "./$@/Contents/Resources/VLC Plugin.rsrc"
......
...@@ -353,6 +353,8 @@ VLC_AddIntf ...@@ -353,6 +353,8 @@ VLC_AddIntf
VLC_CleanUp VLC_CleanUp
VLC_Destroy VLC_Destroy
VLC_Die VLC_Die
VLC_VariableGet
VLC_VariableSet
__vlc_cond_destroy __vlc_cond_destroy
__vlc_cond_init __vlc_cond_init
vlc_current_object vlc_current_object
......
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