Changeset 3746 in orxonox.OLD for orxonox/branches/levelloader/src/Makefile.am

Timestamp:

Apr 7, 2005, 3:54:49 PM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Merged trunk into branch… still not working though…

File:

• orxonox/branches/levelloader/src/Makefile.am (modified) (11 diffs)

orxonox/branches/levelloader/src/Makefile.am

@@ -37 +37 @@
                  simple_animation.cc \
                  factory.cc \
+                 garbage_collector.cc \
                  story_entities/story_entity.cc \
                  story_entities/campaign.cc \
@@ -45 +46 @@
                  world_entities/skysphere.cc \
                  world_entities/terrain.cc \
-                 world_entities/primitive.cc \
                  world_entities/weapon.cc \
                  world_entities/projectile.cc \
                  world_entities/character_attributes.cc \
+                 world_entities/test_gun.cc \
+                 world_entities/test_bullet.cc \
                  ai/ai.cc \
                  lib/coord/p_node.cc \
@@ -54 +56 @@
                  lib/coord/helper_parent.cc \
                  lib/data/data_tank.cc \
+                 lib/graphics/graphics_engine.cc \
                  lib/graphics/light.cc \
                  lib/graphics/font/fontset.cc \
                  lib/graphics/importer/array.cc \
                  lib/graphics/importer/objModel.cc \
+                 lib/graphics/importer/primitive_model.cc \
                  lib/graphics/importer/model.cc \
                  lib/graphics/importer/material.cc \
@@ -66 +70 @@
                  lib/util/list.cc \
                  lib/util/substring.cc \
+                 lib/util/resource_manager.cc \
                  lib/math/vector.cc \
                  lib/math/curve.cc \
@@ -73 +78 @@
                  lib/xmlparser/tinyxmlparser.cc \
                  glmenu/glmenu_imagescreen.cc 
+                 glmenu/glmenu_imagescreen.cc
 
 noinst_HEADERS = orxonox.h \
@@ -80 +86 @@
                  camera.h \
                  keynames.h \
-                 proto_class.h \
                  command_node.h \
                  message_structures.h \
@@ -86 +91 @@
                  track_node.h \
                  simple_animation.h \
+                 garbage_collector.h \
                  story_entities/story_entity.h \
                  story_entities/story_def.h \
@@ -97 +103 @@
                  world_entities/power_up.h \
                  world_entities/terrain.h \
-                 world_entities/primitive.h \
                  world_entities/weapon.h \
                  world_entities/projectile.h \
                  world_entities/character_attributes.h \
+                 world_entities/test_gun.h \
+                 world_entities/test_bullet.h \
                  ai/ai.h \
                  network/synchronisable.h \
                  defs/stdincl.h \
                  defs/glincl.h \
+                 defs/comincl.h \
                  defs/error.h \
                  defs/debug.h \
@@ -110 +118 @@
                  lib/coord/null_parent.h \
                  lib/coord/helper_parent.h \
+                 lib/graphics/graphics_engine.h \
                  lib/graphics/light.h \
                  lib/graphics/font/fontset.h \
@@ -117 +126 @@
                  lib/util/list.h \
                  lib/util/list_template.h \
+                 lib/util/resource_manager.h \
                  lib/util/ini_parser.h \
                  lib/util/substring.h \
@@ -127 +137 @@
 
 ## orxonox.conf will be used from home-dir instead.
-EXTRA_DIST = orxonox.conf
+EXTRA_DIST = orxonox.conf \
+             proto/proto_class.h \
+             proto/proto_class.cc \
+             proto/proto_singleton.h \
+             proto/proto_singleton.cc
 
 if SUB_PROJECTS