MOSTLYCLEANFILES =
CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = $(DIST_sources) install.js npvlc_rc.rc vlc.r
+EXTRA_DIST = $(DIST_sources) npvlc_rc.rc.in COPYING npvlc.dll.manifest
SOURCES_mozilla_common = \
vlcshell.cpp \
+ vlcshell.h \
vlcplugin.cpp \
vlcplugin.h \
control/npolibvlc.cpp \
control/npolibvlc.h \
- control/npovlc.cpp \
- control/npovlc.h \
control/nporuntime.cpp \
control/nporuntime.h \
+ control/position.h \
support/classinfo.h
DIST_sources = $(SOURCES_mozilla_common) \
if BUILD_MOZILLA
-LIBRARIES_libvlc = $(top_builddir)/src/libvlc-control.la \
- $(top_builddir)/src/libvlc.la
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.la \
+ $(top_builddir)/src/libvlccore.la
if HAVE_WIN32
noinst_npvlc_rcdir =
npvlc_rc.$(OBJEXT): npvlc_rc.rc
- $(WINDRES) -DVERSION=$(VERSION) \
- -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` \
- --include-dir $(srcdir) -i $< -o $@
+ $(WINDRES) --include-dir $(srcdir) -i $< -o $@
else
if HAVE_DARWIN
-F/System/Library/Frameworks/CoreFoundation.framework $(moz_CFLAGS) \
-I/Developer/Headers/FlatCarbon -fno-common -fpascal-strings \
-Wmost -Wno-four-char-constants -Wno-unknown-pragmas -DXP_MACOSX=1 \
- -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 \
- -include mozilla-config.h
+ -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0
LDFLAGS_mozilla_EXTRA = -no-undefined -bundle -Wl,-read_only_relocs -Wl,suppress \
-Wl,-headerpad_max_install_names -shrext $(LIBEXT) -Wl,-framework,Carbon -Wl,-framework,System
MOSTLYCLEANFILES += npvlc.rsrc
CLEANFILES += VLC\ Plugin.plugin
-npvlc.rsrc: $(srcdir)/vlc.r
+npvlc.rsrc: vlc.r
/Developer/Tools/Rez -useDF /Developer/Headers/FlatCarbon/Types.r $< -o $@
#
# Plugin uses shared libraries that are located relatively through @executable_path,
# which unfortunately references the path of the App using the Plugin, rather than the
# Plugin itself. Since this Plugin should always be installed in '/Library/Internet Plug-Ins',
-# it is safer to force dylibs to locate dependants through a fixed path
+# it is safer to force dylibs to locate dependents through a fixed path
#
define FIXEXECPATH
otool -L "$$dylib" | \
VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES)
rm -Rf "$@"
- $(INSTALL) -d "$@/Contents/MacOS/lib"
- $(INSTALL) ".libs/npvlc.dylib" "$@/Contents/MacOS/VLC Plugin"
- $(INSTALL) -d "$(srcdir)/$@/Contents/MacOS/lib"; \
- install_name_tool -change "$(libdir)/libvlc.1.dylib" \
- "@executable_path/lib/libvlc.dylib" \
- "$@/Contents/MacOS/VLC Plugin"
- install_name_tool -change "$(libdir)/libvlc-control.1.dylib" \
- "@executable_path/lib/libvlc-control.dylib" \
- "$@/Contents/MacOS/VLC Plugin"
- $(INSTALL) "$(top_builddir)/src/.libs/libvlc.1.dylib" \
- "$@/Contents/MacOS/lib/libvlc.dylib"
- $(INSTALL) "$(top_builddir)/src/.libs/libvlc-control.1.dylib" \
- "$@/Contents/MacOS/lib/libvlc-control.dylib"
- install_name_tool -change "$(libdir)/libvlc.1.dylib" \
- "@executable_path/lib/libvlc.dylib" \
- "$@/Contents/MacOS/lib/libvlc-control.dylib"
- dylib="$@/Contents/MacOS/VLC Plugin"; $(FIXEXECPATH) ;
- dylib="$@/Contents/MacOS/lib/libvlc.dylib"; $(FIXEXECPATH) ;
- dylib="$@/Contents/MacOS/lib/libvlc-control.dylib"; $(FIXEXECPATH) ;
- $(INSTALL) -d "$@/Contents/Resources"
- $(INSTALL) npvlc.rsrc "$@/Contents/Resources/VLC Plugin.rsrc"
- cp -r "$(top_srcdir)/extras/MacOSX/plugin/English.lproj" "$@/Contents/Resources/"
- $(INSTALL) "$(top_srcdir)/extras/MacOSX/plugin/Info.plist" "$@/Contents/Info.plist"
- $(INSTALL) -d "$@/Contents/MacOS/modules"
- for i in "" `$(VLC_CONFIG) --target plugin` ; do \
- if test -n "$$i" ; then \
- dylib="$@/Contents/MacOS/modules/`basename $$i$(LIBEXT)`"; \
- $(INSTALL) "`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" "$$dylib"; \
- install_name_tool -change "$(libdir)/libvlc.1.dylib" \
- "@executable_path/lib/libvlc.dylib" "$$dylib"; \
- $(FIXEXECPATH) ; \
- fi ; \
- done
- if test -d $(top_srcdir)/extras/contrib/vlc-lib; then \
- for i in $(top_srcdir)/extras/contrib/vlc-lib/*.dylib ; do \
- dylib="$@/Contents/MacOS/lib/`basename $${i}`" ; \
- $(INSTALL) -m 644 "$${i}" "$$dylib" ; \
- $(FIXEXECPATH); \
- done ; \
- fi
+ $(INSTALL) -d "VLC-Plugin.plugin/Contents/MacOS/lib"
+ $(INSTALL) -d "VLC-Plugin.plugin/Contents/Resources"
+ ACTION="release-makefile" PRODUCT="VLC-Plugin.plugin" src_dir=$(srcdir) build_dir=$(top_builddir) sh "$(top_srcdir)/projects/macosx/framework/Pre-Compile.sh"
+ $(INSTALL) npvlc.rsrc "VLC-Plugin.plugin/Contents/Resources/VLC Plugin.rsrc"
+ $(INSTALL) "$(top_builddir)/extras/package/macosx/plugin/Info.plist" "VLC-Plugin.plugin/Contents/Info.plist"
+ mv "VLC-Plugin.plugin" "VLC Plugin.plugin"
+ find "VLC Plugin.plugin" -type d -exec chmod ugo+rx '{}' \;
+ find "VLC Plugin.plugin" -type f -exec chmod ugo+r '{}' \;
+
# uncomment if dependencies on XPCOM libs is sought
# if test -d "$(MOZILLA_SDK_PATH)/lib"; then \
# for i in "$(MOZILLA_SDK_PATH)"/lib/*.dylib ; do \
# UNIX/Others platforms
#
+CPPFLAGS_mozilla_EXTRA = -DDATA_PATH=\"$(pkgdatadir)\"
+
npvlc_LTLIBRARIES = libvlcplugin.la
npvlc = libvlcplugin$(LIBEXT)
SOURCES_support = support/npunix.c
libvlcplugin_la_SOURCES = $(SOURCES_mozilla_common) $(SOURCES_support)
-libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla`
-libvlcplugin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla`
+libvlcplugin_la_CFLAGS = `$(VLC_CONFIG) --cflags mozilla` $(CPPFLAGS_mozilla_EXTRA)
+libvlcplugin_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla` $(CPPFLAGS_mozilla_EXTRA)
libvlcplugin_la_LDFLAGS = `$(VLC_CONFIG) --ldflags mozilla` -module -avoid-version -shrext $(LIBEXT)
libvlcplugin_la_LIBADD = $(LIBRARIES_libvlc) `$(VLC_CONFIG) -libs mozilla`
# automake gets confused by the ../..
projects / vlc / blobdiff