mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 02:15:43 -04:00
minor bugs
This commit is contained in:
parent
8bab079cc7
commit
93f9e9933b
@ -22,7 +22,7 @@
|
||||
|
||||
/* Temporary: the location at which p3d_plugin.dll can be found. Empty
|
||||
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. */
|
||||
#if $[not $[P3D_PLUGIN_PLATFORM]]
|
||||
|
@ -297,16 +297,16 @@ stream_as_file(NPStream *stream, const char *fname) {
|
||||
{
|
||||
// This is the core API DLL (or dylib or whatever). Now that
|
||||
// we've downloaded it, we can load it.
|
||||
logfile << "got plugin " << filename << "\n" << flush;
|
||||
string override_filename = P3D_PLUGIN_P3D_PLUGIN;
|
||||
if (!override_filename.empty()) {
|
||||
filename = override_filename;
|
||||
}
|
||||
logfile << "got plugin " << filename << "\n" << flush;
|
||||
if (!load_plugin(filename)) {
|
||||
logfile << "Unable to launch core API.\n";
|
||||
break;
|
||||
}
|
||||
logfile << "loaded core API " << filename << "\n" << flush;
|
||||
logfile << "loaded core API\n";
|
||||
create_instance();
|
||||
}
|
||||
break;
|
||||
|
Loading…
x
Reference in New Issue
Block a user