Changeset 7180 in orxonox.OLD

Timestamp:

Feb 22, 2006, 1:21:29 AM (18 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

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

branches/shared_lib/src/world_entities/Makefile.am

@@ -50 +50 @@
                 libORXenvironmentals.la \
                 \
-                libORXnpcs.la \
+                libORXground_turret.la \
                 \
                 libORXmisc_entities.la
 
-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_test.cc \
-                npcs/npc_test1.cc
-
-libORXenvironmentals_la_SOURCES = \
-                environment.cc \
-                skysphere.cc \
-                satellite.cc \
-                character_attributes.cc \
-                test_entity.cc \
-                planet.cc \
-                environments/water.cc \
-                environments/model_entity.cc \
-                environments/building.cc \
-                \
-                movie_entity.cc \
-                recorder.cc
+libORXplayables_la_SOURCES = \
+                space_ships/helicopter.cc \
+                space_ships/hover.cc \
+                space_ships/turbine_hover.cc \
+                creatures/md2_creature.cc
 
 libORXweapons_la_SOURCES = \
@@ -102 +82 @@
                 power_ups/laser_power_up.cc
 
-libORXplayables_la_SOURCES = \
-                space_ships/helicopter.cc \
-                space_ships/hover.cc \
-                space_ships/turbine_hover.cc \
-                creatures/md2_creature.cc
+
+libORXground_turret_la_SOURCES = \
+                npcs/ground_turret.cc
+#               npcs/npc_test.cc \
+                npcs/npc_test1.cc
+
+libORXenvironmentals_la_SOURCES = \
+                environment.cc \
+                skysphere.cc \
+                satellite.cc \
+                character_attributes.cc \
+                test_entity.cc \
+                planet.cc \
+                environments/water.cc \
+                environments/model_entity.cc \
+                environments/building.cc \
+                \
+                movie_entity.cc \
+                recorder.cc
+
 
 libORXmisc_entities_la_SOURCES = \