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

fix loader output

Browse Source
This commit is contained in:
David Rose 2003-11-04 20:20:47 +00:00
parent 3acd1576c1
commit e534118821
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
panda/src/pgraph/loader.cxx
View File

@ -325,13 +325,15 @@ load_file_types() {
if (words.size() == 1) { if (words.size() == 1) {
// Exactly one word: load the named library immediately. // Exactly one word: load the named library immediately.
Filename dlname = Filename::dso_filename("lib" + words[0] + ".so"); string name = words[0];
Filename dlname = Filename::dso_filename("lib" + name + ".so");
loader_cat.info() loader_cat.info()
<< "loading file type module: " << dlname.to_os_specific() << endl; << "loading file type module: " << name << endl;
void *tmp = load_dso(dlname); void *tmp = load_dso(dlname);
if (tmp == (void *)NULL) { if (tmp == (void *)NULL) {
loader_cat.info() loader_cat.warning()
<< "Unable to load: " << load_dso_error() << endl; << "Unable to load " << dlname.to_os_specific()
<< ": " << load_dso_error() << endl;
} }
} else if (words.size() > 1) { } else if (words.size() > 1) {

5
panda/src/pgraph/loaderFileTypeRegistry.cxx
View File

@ -103,11 +103,12 @@ get_type_from_extension(const string &extension) {
// that this is a race condition if we support threaded loading; // that this is a race condition if we support threaded loading;
// this whole function needs to be protected from multiple // this whole function needs to be protected from multiple
// entry. // entry.
Filename dlname = Filename::dso_filename("lib" + (*di).second + ".so"); string name = (*di).second;
Filename dlname = Filename::dso_filename("lib" + name + ".so");
_deferred_types.erase(di); _deferred_types.erase(di);
loader_cat->info() loader_cat->info()
<< "loading file type module: " << (*di).second << endl; << "loading file type module: " << name << endl;
void *tmp = load_dso(dlname); void *tmp = load_dso(dlname);
if (tmp == (void *)NULL) { if (tmp == (void *)NULL) {
loader_cat->warning() loader_cat->warning()