From 81b832a50ffb576ddbd8566a38ff74a4216001fd Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 26 Aug 2011 23:36:30 +0000 Subject: [PATCH] bump plugin version number --- dtool/Config.pp | 6 ++++-- dtool/PandaVersion.pp | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dtool/Config.pp b/dtool/Config.pp index 8b71538d38..5c93eb44ae 100644 --- a/dtool/Config.pp +++ b/dtool/Config.pp @@ -792,11 +792,13 @@ #defer HAVE_AWESOMIUM $[libtest $[AWESOMIUM_LPATH],$[AWESOMIUM_LIBS]] // Mozilla's so-called Gecko SDK, a.k.a. Xulrunner SDK, implements -// NPAPI, Mozilla's semi-standard API to build a web plugin for -// Firefox and other Mozilla-based browsers. +// NPAPI. So does the OSX WebKit framework. Either implementation +// can be used to build a web plugin for Firefox, Safari, Chrome, and +// other non-Microsoft browsers. #define NPAPI_IPATH #define NPAPI_LPATH #define NPAPI_LIBS +#define NPAPI_FRAMEWORK #define HAVE_NPAPI #define HAVE_ACTIVEX $[WINDOWS_PLATFORM] diff --git a/dtool/PandaVersion.pp b/dtool/PandaVersion.pp index 89ec8ce279..23e0a4471d 100644 --- a/dtool/PandaVersion.pp +++ b/dtool/PandaVersion.pp @@ -34,15 +34,15 @@ // PANDA_PACKAGE_VERSION, because it is anticipated that this plugin // code, once settled, will need to be updated much less frequently // than Panda itself. -#define P3D_PLUGIN_VERSION 1 0 3 +#define P3D_PLUGIN_VERSION 1 0 4 // Finally, there's a separate version number for the Core API. At // first, we didn't believe we needed a Core API version number, but // in this belief we were naive. This version number is a little less // strict in its format requirements than P3D_PLUGIN_VERSION, above, // and it doesn't necessarily consist of a specific number of -// integers, but by convention it will consist of four integers, and -// with the first three matching the plugin version, and the fourth -// integer being incremented with each new Core API revision. -#define P3D_COREAPI_VERSION $[P3D_PLUGIN_VERSION] 3 +// integers, but by convention it will consist of four integers, with +// the first three matching the plugin version, and the fourth integer +// being incremented with each new Core API revision. +#define P3D_COREAPI_VERSION $[P3D_PLUGIN_VERSION] 1