Commit 2801e716 authored by Felix Paul Kühne's avatar Felix Paul Kühne Committed by Rémi Denis-Courmont

macosx: really fixed packaging of the Mozilla/Safari plugin

Note that it will try to use the X11 vout right now, so you won't get any visible video output
parent aecc4e32
...@@ -104,15 +104,16 @@ endef ...@@ -104,15 +104,16 @@ endef
VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES) VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES)
rm -Rf "$@" rm -Rf "$@"
$(INSTALL) -d "$@/Contents/MacOS/lib" $(INSTALL) -d "VLC-Plugin.plugin/Contents/MacOS/lib"
$(INSTALL) -d "$@/Contents/Resources" $(INSTALL) -d "VLC-Plugin.plugin/Contents/Resources"
$(INSTALL) .libs/npvlc.dylib "$@/Contents/MacOS/VLC Plugin" ACTION="release-makefile" PRODUCT="VLC-Plugin.plugin" src_dir=$(srcdir) build_dir=$(top_builddir) sh ../macosx/framework/Pre-Compile.sh
dylib="$@/Contents/MacOS/VLC Plugin"; $(FIXEXECPATH); $(INSTALL) .libs/npvlc.dylib "VLC-Plugin.plugin/Contents/MacOS/VLC Plugin"
$(INSTALL) npvlc.rsrc "$@/Contents/Resources/VLC Plugin.rsrc" dylib="VLC-Plugin.plugin/Contents/MacOS/VLC Plugin"; $(FIXEXECPATH);
cp -r "$(top_srcdir)/extras/package/macosx/plugin/English.lproj" "$@/Contents/Resources/" $(INSTALL) npvlc.rsrc "VLC-Plugin.plugin/Contents/Resources/VLC Plugin.rsrc"
cp -r "$(top_builddir)/extras/package/macosx/plugin/English.lproj" "$@/Contents/Resources/" cp -r "$(top_srcdir)/extras/package/macosx/plugin/English.lproj" "VLC-Plugin.plugin/Contents/Resources/"
$(INSTALL) "$(top_builddir)/extras/package/macosx/plugin/Info.plist" "$@/Contents/Info.plist" cp -r "$(top_builddir)/extras/package/macosx/plugin/English.lproj" "VLC-Plugin.plugin/Contents/Resources/"
ACTION="release-makefile" PRODUCT="VLC Plugin.plugin" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh $(INSTALL) "$(top_builddir)/extras/package/macosx/plugin/Info.plist" "VLC-Plugin.plugin/Contents/Info.plist"
mv "VLC-Plugin.plugin" "VLC Plugin.plugin"
# uncomment if dependencies on XPCOM libs is sought # uncomment if dependencies on XPCOM libs is sought
# if test -d "$(MOZILLA_SDK_PATH)/lib"; then \ # if test -d "$(MOZILLA_SDK_PATH)/lib"; then \
......
...@@ -87,9 +87,8 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[]) ...@@ -87,9 +87,8 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
/* locate VLC module path */ /* locate VLC module path */
#ifdef XP_MACOSX #ifdef XP_MACOSX
ppsz_argv[ppsz_argc++] = "--plugin-path"; ppsz_argv[ppsz_argc++] = "--plugin-path=/Library/Internet\\ Plug-Ins/VLC\\ Plugin.plugin/Contents/MacOS/modules";
ppsz_argv[ppsz_argc++] = "/Library/Internet Plug-Ins/VLC Plugin.plugin/" ppsz_argv[ppsz_argc++] = "--vout=macosx";
"Contents/MacOS/modules";
#elif defined(XP_WIN) #elif defined(XP_WIN)
HKEY h_key; HKEY h_key;
DWORD i_type, i_data = MAX_PATH + 1; DWORD i_type, i_data = MAX_PATH + 1;
...@@ -118,8 +117,7 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[]) ...@@ -118,8 +117,7 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
ppsz_argv[ppsz_argc++] = "--no-stats"; ppsz_argv[ppsz_argc++] = "--no-stats";
ppsz_argv[ppsz_argc++] = "--no-media-library"; ppsz_argv[ppsz_argc++] = "--no-media-library";
ppsz_argv[ppsz_argc++] = "--ignore-config"; ppsz_argv[ppsz_argc++] = "--ignore-config";
ppsz_argv[ppsz_argc++] = "--intf"; ppsz_argv[ppsz_argc++] = "--intf=dummy";
ppsz_argv[ppsz_argc++] = "dummy";
const char *progid = NULL; const char *progid = NULL;
......
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