Changeset 7268 in orxonox.OLD for branches/shared_lib/src

Timestamp:

Apr 2, 2006, 5:54:55 PM (19 years ago)

Author:

bensch

Message:

shared_lib, ok loading everything (strangely npc is not a default dependency for orxonox, nowhere is it referenced… (but in NPC's)

Location:

branches/shared_lib/src

Files:

• orxonox.cc (modified) (2 diffs)
• world_entities/Makefile.am (modified) (3 diffs)

branches/shared_lib/src/orxonox.cc

@@ -343 +343 @@
 
 
-  if (!DynamicLoader::addSearchDirRelative("./world_entities/libs"))
-    if (!DynamicLoader::addSearchDirRelative("./src/world_entities/libs"))
+  if (!DynamicLoader::addSearchDirRelative("./world_entities/.libs"))
+    if (!DynamicLoader::addSearchDirRelative("./src/world_entities/.libs"))
       DynamicLoader::addSearchDir(PKG_LIBDIR);
 
@@ -356 +356 @@
   DynamicLoader::loadDyLib("libORXenvironmentals.la");
 
+  DynamicLoader::loadDyLib("libORXmisc_entities.la");
   DynamicLoader::loadDyLib("libORXnpcs.la");
-
-  DynamicLoader::loadDyLib("libORXmisc_entities.la");
   printf("%s\n", DynamicLoader::getSearchDir());
 

branches/shared_lib/src/world_entities/Makefile.am

@@ -16 +16 @@
                 player.cc \
                 \
-                npcs/npc.cc \
                 \
                 weapons/weapon_manager.cc \
@@ -39 +38 @@
                 \
                 $(WRONG_SORTED_SOURCES_)
+
+#               npcs/npc.cc
 
 LDFLAGS = --export-dynamic -module
@@ -84 +85 @@
 
 libORXnpcs_la_SOURCES = \
+                npcs/npc.cc \
                 npcs/ground_turret.cc \
                 npcs/npc_test.cc \