Anglade Pierre-Matthieu wrote:

This patch works for me. It doesn't build libmozsdk at all, but instead compiles the files directly into the plugin. This should hopefully fix the issue of Firefox quietly not doing anything.

If this works for the various 64 bit systems out there, I'll check it in after I test this to make sure all the packaging code still works correctly.

        - rob -

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.58
diff -u -b -B -w -r1.58 configure.ac
--- configure.ac        11 Apr 2006 17:11:09 -0000      1.58
+++ configure.ac        19 Apr 2006 16:25:10 -0000
@@ -335,8 +341,8 @@
 testsuite/Makefile
 testsuite/actionscript.all/Makefile
 plugin/Makefile
-plugin/mozilla-sdk/Makefile
 plugin/klash/Makefile
 )
 dnl config.mk
 dnl plugin/test/Makefile

Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.19
diff -u -b -B -w -r1.19 Makefile.am
--- plugin/Makefile.am  10 Apr 2006 01:18:11 -0000      1.19
+++ plugin/Makefile.am  19 Apr 2006 16:25:10 -0000
@@ -42,7 +42,7 @@
 if KLASH
 KLASH = klash
 endif
-SUBDIRS = mozilla-sdk $(KLASH) # test
+SUBDIRS = $(KLASH) # test mozilla-sdk

 if MP3
 MP3_CFLAGS = $(MAD_CFLAGS)
@@ -106,11 +106,35 @@

 plugin_LTLIBRARIES = libgnashplugin.la

-noinst_HEADERS = plugin.h #player.h
+noinst_HEADERS = plugin.h \
+        mozilla-sdk/pluginbase.h \
+         mozilla-sdk/include/jri.h \
+        mozilla-sdk/include/npapi.h \
+         mozilla-sdk/include/npupp.h \
+         mozilla-sdk/include/prtypes.h \
+         mozilla-sdk/include/jni.h \
+         mozilla-sdk/include/jri_md.h \
+         mozilla-sdk/include/npruntime.h \
+         mozilla-sdk/include/jni_md.h \
+         mozilla-sdk/include/jritypes.h \
+         mozilla-sdk/include/nptypes.h \
+         mozilla-sdk/include/prcpucfg.h \
+         mozilla-sdk/include/prlock.h \
+         mozilla-sdk/include/prcvar.h \
+         mozilla-sdk/include/prthread.h \
+         mozilla-sdk/include/prinit.h \
+         mozilla-sdk/include/prerr.h \
+         mozilla-sdk/include/prerror.h \
+         mozilla-sdk/include/prinrval.h \
+        mozilla-sdk/include/prwin16.h \
+         mozilla-sdk/include/obsolete/protypes.h
+
+libgnashplugin_la_SOURCES  = plugin.cpp \
+       mozilla-sdk/npn_gate.cpp \
+        mozilla-sdk/npp_gate.cpp \
+        mozilla-sdk/np_entry.cpp

-libgnashplugin_la_SOURCES  = plugin.cpp #player.cpp
 libgnashplugin_la_LIBADD   = $(AM_LDFLAGS) \
-       mozilla-sdk/libmozsdk.la\
        ../backend/libgnashbackend.la\
        ../server/libgnashasobjs.la \
        ../server/libgnashserver.la\

        - rob -






_______________________________________________
Gnash mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnash

Reply via email to