Changeset 7181 in orxonox.OLD for branches

Timestamp:

Feb 22, 2006, 1:23:03 AM (19 years ago)

Author:

bensch

Message:

sync

Location:

branches/shared_lib/src

Files:

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

branches/shared_lib/src/orxonox.cc

@@ -340 +340 @@
   /// FIXME make this more modular (search for himself for all the libraries
   printf("%s\n", DynamicLoader::getSearchDir());
-  DynamicLoader::loadDyLib("libORXenvironmentals");
   DynamicLoader::loadDyLib("libORXplayables");
   DynamicLoader::loadDyLib("libORXweapons");
   DynamicLoader::loadDyLib("libORXprojectiles");
   DynamicLoader::loadDyLib("libORXpower_ups");
+
+  DynamicLoader::loadDyLib("libORXenvironmentals");
+
+  DynamicLoader::loadDyLib("libORXnpcs");
+
   DynamicLoader::loadDyLib("libORXmisc_entities");
-  DynamicLoader::loadDyLib("libORXground_turret");
   printf("%s\n", DynamicLoader::getSearchDir());
 

branches/shared_lib/src/world_entities/Makefile.am

@@ -50 +50 @@
                 libORXenvironmentals.la \
                 \
-                libORXground_turret.la \
+                libORXnpcs.la \
                 \
                 libORXmisc_entities.la
@@ -83 +83 @@
 
 
-libORXground_turret_la_SOURCES = \
-                npcs/ground_turret.cc
-#               npcs/npc_test.cc \
+libORXnpcs_la_SOURCES = \
+                npcs/ground_turret.cc \
+                npcs/npc_test.cc \
                 npcs/npc_test1.cc