* configure.ac, mozilla/Makefile.am: more win32 mozilla plugin build fixes.

[vlc] / mozilla / Makefile.am

diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index 7737bf28549648f18e13f0bf7fa8e60cca2a7e38..0e384ec66113bd06e0033a03cfcc1de97b3080a7 100644 (file)
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -29,8 +29,13 @@ SOURCES_win32 = support/npwin.cpp
 CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
 else
 if HAVE_DARWIN
-# We don't define LIBRARIES_mozilla because we'll be using project builder
-SOURCES_macosx = support/npmac.cpp
+# We don't define LIBRARIES_mozilla because we'll be using project builder, or not...
+BUNDLE_mozilla = VLC\ Plugin.plugin
+
+vlc_moz_FLAGS = `$(VLC_CONFIG) --libs vlc builtin pic mozilla`
+moz_CFLAGS = `$(MOZILLA_CONFIG) --cflags plugin java nspr/obsolete nspr oji xpcom xpconnect`
+moz_plugin_FLAGS = -I$(srcdir)/../include -c -F/System/Library/Frameworks/CoreFoundation.framework $(moz_CFLAGS) -I/Developer/Headers/FlatCarbon -arch ppc -fno-common -fpascal-strings -O0 -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -DXP_MACOSX=1 -DNO_X11=1 -DUSE_SYSTEM_CONSOLE=1 -pipe -fmessage-length=0 -g -include mozilla-config.h
+
 else
 LIBRARIES_mozilla = libvlcplugin$(LIBEXT)
 SOURCES_unix = support/npunix.c
@@ -52,10 +57,10 @@ libplugin_a_DEPENDENCIES = $(DATA_npvlc_rc)
 BUILT_SOURCES_mozilla = vlcintf.h
 $(SOURCES_mozilla): vlcintf.h
 
-plugin_DATA = $(LIBRARIES_mozilla)
+plugin_DATA = $(LIBRARIES_mozilla) $(BUNDLE_mozilla)
 plugindir = $(libdir)/mozilla/plugins
 $(LIBRARIES_mozilla): $(libplugin_a_OBJECTS) \
-                     $(libplugin_a_DEPENDENCIES) $(top_builddir)/stamp-pic
+                     $(libplugin_a_DEPENDENCIES) stamp-pic
        $(CXXLINK) $(libplugin_a_OBJECTS) $(DATA_npvlc_rc) \
          $(top_builddir)/lib/libvlc_pic.a -shared \
          `$(VLC_CONFIG) --libs vlc mozilla builtin pic`
@@ -63,11 +68,13 @@ $(LIBRARIES_mozilla): $(libplugin_a_OBJECTS) \
 vlcintf_xpt_DATA = vlcintf.xpt
 vlcintf_xptdir = $(libdir)/mozilla/components
 vlcintf.xpt: vlcintf.idl
-       $(XPIDL) -I/usr/share/idl/mozilla -I/usr/lib/mozilla/include/idl \
+       $(XPIDL) $(XPIDL_INCL) -I/usr/share/idl/mozilla \
+         -I/usr/lib/mozilla/include/idl \
          -m typelib -o vlcintf $(srcdir)/vlcintf.idl
 
 vlcintf.h: vlcintf.idl
-       $(XPIDL) -I/usr/share/idl/mozilla -I/usr/lib/mozilla/include/idl \
+       $(XPIDL) $(XPIDL_INCL) -I/usr/share/idl/mozilla \
+         -I/usr/lib/mozilla/include/idl \
          -m header -o vlcintf $(srcdir)/vlcintf.idl
 
 if HAVE_WIN32
@@ -75,14 +82,31 @@ DATA_npvlc_rc = $(noinst_npvlc_rc_DATA)
 noinst_npvlc_rc_DATA = npvlc_rc.$(OBJEXT)
 noinst_npvlc_rcdir = $(libdir)
 npvlc_rc.$(OBJEXT): npvlc_rc.rc
-       $(WINDRES) --include-dir $(srcdir)/mozilla -i $< -o $@
+       $(WINDRES) --include-dir $(srcdir) -i $< -o $@
+endif
+if HAVE_DARWIN
+VLC\ Plugin.plugin:
+       rm -rf $(srcdir)/VLC\ Plugin.plugin
+       mkdir -p $(srcdir)/VLC\ Plugin.plugin/Contents/MacOS
+       mkdir -p $(srcdir)/VLC\ Plugin.plugin/Contents/Resources
+       /usr/bin/g++3 $(moz_plugin_FLAGS) $(srcdir)/vlcplugin.cpp -o $(srcdir)/libplugin_a-vlcplugin.o
+       /usr/bin/g++3 $(moz_plugin_FLAGS) $(srcdir)/vlcshell.cpp -o $(srcdir)/libplugin_a-vlcshell.o
+       /usr/bin/g++3 $(moz_plugin_FLAGS) $(srcdir)/vlcpeer.cpp -o $(srcdir)/libplugin_a-vlcpeer.o
+       /usr/bin/g++3 $(moz_plugin_FLAGS) $(srcdir)/support/npmac.cpp -o $(srcdir)/libplugin_a-npmac.o
+       /usr/bin/g++3 $(srcdir)/libplugin_a-vlcplugin.o $(srcdir)/libplugin_a-vlcshell.o $(srcdir)/libplugin_a-vlcpeer.o $(srcdir)/libplugin_a-npmac.o -o $(srcdir)/VLC\ Plugin.plugin/Contents/MacOS/VLC\ Plugin -L/usr/lib -F/System/Library/Frameworks/CoreFoundation.framework -framework CoreFoundation -arch ppc -bundle -read_only_relocs suppress $(top_srcdir)/lib/libvlc_pic.a -dylib $(vlc_moz_FLAGS)
+       cp $(top_srcdir)/extras/MacOSX/plugin/Info.plist $(srcdir)/VLC\ Plugin.plugin/Contents/Info.plist
+       cp $(top_srcdir)/extras/MacOSX/plugin/pbdevelopment.plist $(srcdir)/VLC\ Plugin.plugin/Contents/pbdevelopment.plist
+       cp -r $(top_srcdir)/extras/MacOSX/plugin/English.lproj $(srcdir)/VLC\ Plugin.plugin/Contents/Resources/
+       Rez /Developer/Headers/FlatCarbon/Types.r $(srcdir)/vlc.r -o $(srcdir)/VLC\ Plugin.plugin/Contents/Resources/Vlc\ Plugin.rsrc
+       mkdir $(srcdir)/VLC\ Plugin.plugin/Contents/MacOS/modules
+       cp -r $(top_srcdir)/VLC.app/Contents/MacOS/modules/* $(srcdir)/VLC\ Plugin.plugin/Contents/MacOS/modules/
 endif
 endif
 
 ###############################################################################
 # Stamp rules
 ###############################################################################
-clean: clean-stamp
+clean: clean-stamp clean-bundle
 clean-stamp:
        rm -f stamp-pic
 
@@ -95,6 +119,9 @@ stamp-pic: FORCE
        done
        @if test ! -f $@; then printf "" > $@; fi
 
+clean-bundle:
+       rm -rf $(srcdir)/VLC\ Plugin.plugin
+
 ###############################################################################
 # Force rule
 ###############################################################################