TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 01:44:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation issues with the runtime

Browse Source
This commit is contained in:
rdb 2015-03-21 21:33:32 +01:00
parent ba6529811d
commit 7edecd7fea
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/plugin_npapi/ppBrowserObject.cxx
View File

@ -230,7 +230,7 @@ call(const string &method_name, P3D_object *params[], int num_params) const {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
P3D_object *PPBrowserObject:: P3D_object *PPBrowserObject::
eval(const string &expression) const { eval(const string &expression) const {
NPString npexpr = { expression.c_str(), expression.length() }; NPString npexpr = { expression.c_str(), (uint32_t)expression.length() };
NPVariant result; NPVariant result;
if (!browser->evaluate(_instance->get_npp_instance(), _npobj, if (!browser->evaluate(_instance->get_npp_instance(), _npobj,

2
direct/src/plugin_npapi/ppInstance.cxx
View File

@ -2173,7 +2173,7 @@ set_failed() {
NPObject *window_object = NULL; NPObject *window_object = NULL;
if (browser->getvalue(_npp_instance, NPNVWindowNPObject, if (browser->getvalue(_npp_instance, NPNVWindowNPObject,
&window_object) == NPERR_NO_ERROR) { &window_object) == NPERR_NO_ERROR) {
NPString npexpr = { expression.c_str(), expression.length() }; NPString npexpr = { expression.c_str(), (uint32_t)expression.length() };
NPVariant result; NPVariant result;
if (browser->evaluate(_npp_instance, window_object, if (browser->evaluate(_npp_instance, window_object,
&npexpr, &result)) { &npexpr, &result)) {

2
direct/src/plugin_npapi/startup.cxx
View File

@ -187,7 +187,7 @@ NP_Initialize(NPNetscapeFuncs *browserFuncs,
} }
#endif #endif
int browser_major = (browser->version >> 8) && 0xff; int browser_major = (browser->version >> 8) & 0xff;
int browser_minor = browser->version & 0xff; int browser_minor = browser->version & 0xff;
nout << "Browser NPAPI version " << browser_major << "." << browser_minor << "\n"; nout << "Browser NPAPI version " << browser_major << "." << browser_minor << "\n";

4
makepanda/makepanda.py
View File

@ -439,6 +439,10 @@ if (RTDIST and DISTRIBUTOR == "cmu"):
elif RTDIST and not HOST_URL: elif RTDIST and not HOST_URL:
exit("You must specify a host URL when building the rtdist!") exit("You must specify a host URL when building the rtdist!")
if RUNTIME and not HOST_URL:
# Set this to a nice default.
HOST_URL = "https://runtime.panda3d.org/"
######################################################################## ########################################################################
## ##
## Choose a Compiler. ## Choose a Compiler.

2
panda/src/dxml/tinyxml.h
View File

@ -26,6 +26,8 @@ distribution.
#ifndef TINYXML_INCLUDED #ifndef TINYXML_INCLUDED
#define TINYXML_INCLUDED #define TINYXML_INCLUDED
#include "pandasymbols.h"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable : 4530 ) #pragma warning( disable : 4530 )