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

minor bugs

Browse Source
This commit is contained in:
David Rose 2009-06-24 03:58:37 +00:00
parent 8bab079cc7
commit 93f9e9933b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/plugin/p3d_plugin_config.h.pp
View File

@ -22,7 +22,7 @@
/* Temporary: the location at which p3d_plugin.dll can be found. Empty /* Temporary: the location at which p3d_plugin.dll can be found. Empty
string for the default. */ string for the default. */
#$[]define P3D_PLUGIN_P3D_PLUGIN "$[osfilename $[P3D_PLUGIN_P3D_PLUGIN]]" #$[]define P3D_PLUGIN_P3D_PLUGIN "$[subst \,\\,$[osfilename $[P3D_PLUGIN_P3D_PLUGIN]]]"
/* The string that corresponds to this particular platform. */ /* The string that corresponds to this particular platform. */
#if $[not $[P3D_PLUGIN_PLATFORM]] #if $[not $[P3D_PLUGIN_PLATFORM]]

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

@ -297,16 +297,16 @@ stream_as_file(NPStream *stream, const char *fname) {
{ {
// This is the core API DLL (or dylib or whatever). Now that // This is the core API DLL (or dylib or whatever). Now that
// we've downloaded it, we can load it. // we've downloaded it, we can load it.
logfile << "got plugin " << filename << "\n" << flush;
string override_filename = P3D_PLUGIN_P3D_PLUGIN; string override_filename = P3D_PLUGIN_P3D_PLUGIN;
if (!override_filename.empty()) { if (!override_filename.empty()) {
filename = override_filename; filename = override_filename;
} }
logfile << "got plugin " << filename << "\n" << flush;
if (!load_plugin(filename)) { if (!load_plugin(filename)) {
logfile << "Unable to launch core API.\n"; logfile << "Unable to launch core API.\n";
break; break;
} }
logfile << "loaded core API " << filename << "\n" << flush; logfile << "loaded core API\n";
create_instance(); create_instance();
} }
break; break;