Browse Source

build on mac

David Rose 16 years ago
parent
commit
71d65bb60c

+ 11 - 1
direct/src/plugin_npapi/nppanda3d_startup.cxx

@@ -147,8 +147,18 @@ NPP_SetValue(NPP instance, NPNVariable variable, void *value) {
 }
 
 // Symbol called once by the browser to initialize the plugin
+#ifdef _WIN32
+NPError OSCALL 
+NP_Initialize(NPNetscapeFuncs *browserFuncs)
+#else
+// On Mac, the API specifies this second parameter is included, but it
+// lies.  We actually don't get a second parameter on Mac, but we have
+// to put it here to make the compiler happy.
 NPError OSCALL
-NP_Initialize(NPNetscapeFuncs *browserFuncs) {
+NP_Initialize(NPNetscapeFuncs *browserFuncs,
+              NPPluginFuncs *pluginFuncs)
+#endif
+{
   // save away browser functions
   browser = browserFuncs;
 

+ 6 - 0
direct/src/plugin_npapi/nppanda3d_startup.h

@@ -20,7 +20,13 @@
 #include "../plugin/load_plugin_src.h"
 
 extern "C" {
+#ifdef _WIN32
   NPError OSCALL NP_Initialize(NPNetscapeFuncs *browserFuncs);
+#else
+  NPError OSCALL NP_Initialize(NPNetscapeFuncs *browserFuncs,
+                               NPPluginFuncs *pluginFuncs);
+#endif
+
   NPError OSCALL NP_GetEntryPoints(NPPluginFuncs *pluginFuncs);
   NPError OSCALL NP_Shutdown(void);
 }