Changeset 7176 in orxonox.OLD for branches

Timestamp:

Feb 21, 2006, 11:32:21 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now the process should really work

Location:

branches/shared_lib/src

Files:

• orxonox.cc (modified) (1 diff)
• world_entities/Makefile.am (modified) (1 diff)

branches/shared_lib/src/orxonox.cc

@@ -333 +333 @@
   delete[] imageDir;
 
-  DynamicLoader::addSearchDirRelative("./world_entities");
-  DynamicLoader::addSearchDirRelative("./src/world_entities");
-  DynamicLoader::addSearchDir(PKG_LIBDIR);
+  if (!DynamicLoader::addSearchDirRelative("./world_entities"))
+    if (!DynamicLoader::addSearchDirRelative("./src/world_entities"))
+      DynamicLoader::addSearchDir(PKG_LIBDIR);
+
   DynamicLoader::loadDyLib("libORXground_turret");
-
+  printf("%s\n", DynamicLoader::getSearchDir());
   // start the collision detection engine
   CDEngine::getInstance();

branches/shared_lib/src/world_entities/Makefile.am

@@ -4 +4 @@
 
 noinst_LIBRARIES = libORXwe.a
+
 pkglib_LTLIBRARIES = libORXground_turret.la
 libORXground_turret_la_SOURCES = npcs/ground_turret.cc
+
+
 
 ## THESE ARE THE BASE CLASSES OF ALL WORLD_ENTITIES