Changeset 7266 in orxonox.OLD for branches/shared_lib
- Timestamp:
- Apr 2, 2006, 5:40:29 PM (19 years ago)
- Location:
- branches/shared_lib/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/shared_lib/src/lib/util/loading/dynamic_loader.cc
r7264 r7266 103 103 if (ResourceManager::isDir(absSearchDir)) 104 104 { 105 //printf("ADDED %s\n", absSearchDir.c_str()); 105 106 DynamicLoader::addSearchDir(absSearchDir); 106 107 return true; … … 108 109 else 109 110 { 111 //printf("not a directory %s\n", absSearchDir.c_str()); 110 112 return false; 111 113 } -
branches/shared_lib/src/lib/util/loading/resource_manager.cc
r7264 r7266 870 870 return ""; 871 871 std::string retName = name; 872 if ( strncmp(name.c_str(), "/", 1))872 if (name[0] != '/') 873 873 { 874 874 if (name[0] == '.' && name[1] != '.') 875 retName.erase(0); 876 const std::string& absDir = ResourceManager::cwd(); 877 retName = absDir + retName; 875 retName.erase(0, 1); 876 retName = ResourceManager::cwd() + retName; 878 877 } 879 878 return retName; -
branches/shared_lib/src/orxonox.cc
r7264 r7266 341 341 ResourceManager::getInstance()->addImageDir(imageDir); 342 342 343 344 343 345 if (!DynamicLoader::addSearchDirRelative("./world_entities")) 344 346 if (!DynamicLoader::addSearchDirRelative("./src/world_entities")) … … 346 348 347 349 /// FIXME make this more modular (search for himself for all the libraries 348 printf("%s\n", DynamicLoader::getSearchDir());350 PRINTF(0)("We are searching for plugins in %s\n", DynamicLoader::getSearchDir()); 349 351 DynamicLoader::loadDyLib("libORXplayables.la"); 350 352 DynamicLoader::loadDyLib("libORXweapons.la"); … … 354 356 DynamicLoader::loadDyLib("libORXenvironmentals.la"); 355 357 356 DynamicLoader::loadDyLib("libORXnpcs ");357 358 DynamicLoader::loadDyLib("libORXmisc_entities ");358 DynamicLoader::loadDyLib("libORXnpcs.la"); 359 360 DynamicLoader::loadDyLib("libORXmisc_entities.la"); 359 361 printf("%s\n", DynamicLoader::getSearchDir()); 360 362
Note: See TracChangeset
for help on using the changeset viewer.