Changeset 7179 in orxonox.OLD for branches

Timestamp:

Feb 22, 2006, 1:02:06 AM (19 years ago)

Author:

bensch

Message:

testing

Location:

branches/shared_lib/src

Files:

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

branches/shared_lib/src/orxonox.cc

@@ -347 +347 @@
   DynamicLoader::loadDyLib("libORXmisc_entities");
   DynamicLoader::loadDyLib("libORXnpcs_ground.la");
+  DynamicLoader::loadDyLib("libORXnpcs");
   DynamicLoader::loadDyLib("libORXnpcs_air");
   printf("%s\n", DynamicLoader::getSearchDir());

branches/shared_lib/src/world_entities/Makefile.am

@@ -43 +43 @@
 
 pkglib_LTLIBRARIES = \
-                libORXnpcs_ground.la \
-                libORXnpcs_air.la \
-                libORXenvironmentals.la \
+                libORXplayables.la \
                 libORXweapons.la \
                 libORXprojectiles.la \
                 libORXpower_ups.la \
-                libORXplayables.la \
+                \
+                libORXenvironmentals.la \
+                \
+                libORXnpcs.la \
+                \
                 libORXmisc_entities.la
 
-libORXnpcs_ground_la_SOURCES = \
+libORXnpcs_la_SOURCES = \
+                npcs/ground_turret.cc \
+                npcs/npc_test.cc \
+                npcs/npc_test1.cc
+
+
+#libORXnpcs_ground_la_SOURCES = \
                 npcs/ground_turret.cc
 
-libORXnpcs_air_la_SOURCES = \
-                npcs/npc_test1.cc \
-                npcs/npc_test.cc
+#libORXnpcs_air_la_SOURCES = \
+                npcs/npc_test.cc \
+                npcs/npc_test1.cc
 
 libORXenvironmentals_la_SOURCES = \
@@ -79 +87 @@
                 weapons/cannon.cc \
                 weapons/hyperblaster.cc \
-                weapons/aim.cc
-
-#               weapons/test_gun.cc
+                weapons/aim.cc\
+                weapons/test_gun.cc
 
 libORXprojectiles_la_SOURCES = \