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

Timestamp:

Mar 18, 2005, 11:52:15 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

File:

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

orxonox/branches/levelloader/src/Makefile.am

@@ -6 +6 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/coord
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/font
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
@@ -34 +34 @@
                  camera.cc \
                  track_manager.cc \
-                 light.cc \
+                 track_node.cc \
+                 simple_animation.cc \
                  factory.cc \
                  story_entities/story_entity.cc \
@@ -43 +44 @@
                  world_entities/environment.cc \
                  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 \
                  ai/ai.cc \
                  lib/coord/p_node.cc \
@@ -48 +54 @@
                  lib/coord/helper_parent.cc \
                  lib/data/data_tank.cc \
+                 lib/graphics/light.cc \
                  lib/graphics/font/fontset.cc \
                  lib/graphics/importer/array.cc \
@@ -60 +67 @@
                  lib/util/substring.cc \
                  lib/math/vector.cc \
-                 lib/math/matrix.cc \
                  lib/math/curve.cc \
                  lib/xmlparser/tinystr.cc \
@@ -77 +83 @@
                  command_node.h \
                  message_structures.h \
-                 light.h \
+                 track_manager.h \
+                 track_node.h \
+                 simple_animation.h \
                  story_entities/story_entity.h \
                  story_entities/story_def.h \
@@ -87 +95 @@
                  world_entities/environment.h \
                  world_entities/skysphere.h \
-                 world_entities/shoot_laser.h \
-                 world_entities/shoot_rocket.h \
                  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 \
                  ai/ai.h \
                  network/synchronisable.h \
@@ -99 +110 @@
                  lib/coord/null_parent.h \
                  lib/coord/helper_parent.h \
+                 lib/graphics/light.h \
                  lib/graphics/font/fontset.h \
                  lib/data/data_tank.h \
@@ -110 +122 @@
                  lib/xmlparser/tinystr.h \
                  lib/math/vector.h \
-                 lib/math/matrix.h \
                  lib/math/curve.h \
                  glmenu/glmenu_imagescreen.h 
@@ -119 +130 @@
 
 if SUB_PROJECTS
-  SUB_PROGS = lib
+  SUB_PROGS = lib subprojects
 else
   SUB_PROGS =