Changeset 6915 in orxonox.OLD

Timestamp:

Jan 31, 2006, 9:49:35 PM (18 years ago)

Author:

bensch

Message:

some fixes in subprojects

File:

• branches/current_cd/src/subprojects/collision_detection/Makefile.am (modified) (2 diffs)

branches/current_cd/src/subprojects/collision_detection/Makefile.am

@@ -15 +15 @@
                   $(MAINSRCDIR)/lib/event/libORXevent.a \
                   $(MAINSRCDIR)/lib/sound/libORXsound.a \
-                  $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                  $(MAINSRCDIR)/lib/parser/tinyxml/libtinyxml.a \
                   $(MAINSRCDIR)/lib/graphics/spatial_separation/libORXquadtree.a \
                   $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
@@ -24 +24 @@
 
 
-collision_SOURCES= ../framework.cc \
-                   collision_detection.cc \
-                   \
-                   $(MAINSRCDIR)/lib/util/helper_functions.cc \
-                   $(MAINSRCDIR)/lib/util/substring.cc \
-                   $(MAINSRCDIR)/lib/parser/ini_parser/ini_parser.cc \
-                   $(MAINSRCDIR)/lib/lang/base_object.cc \
-                   $(MAINSRCDIR)/lib/lang/class_list.cc \
-                   $(MAINSRCDIR)/lib/math/vector.cc \
-                   $(MAINSRCDIR)/lib/util/color.cc \
-                   $(MAINSRCDIR)/lib/coord/p_node.cc \
-                   $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc \
-                   \
-                   $(MAINSRCDIR)/world_entities/world_entity.cc \
-                   $(MAINSRCDIR)/world_entities/camera.cc \
-                   collision_test_entity.cc
+collision_SOURCES= \
+                ../framework.cc \
+                collision_detection.cc \
+                \
+                $(MAINSRCDIR)/lib/util/helper_functions.cc \
+                $(MAINSRCDIR)/lib/util/substring.cc \
+                $(MAINSRCDIR)/lib/parser/ini_parser/ini_parser.cc \
+                $(MAINSRCDIR)/lib/lang/base_object.cc \
+                $(MAINSRCDIR)/lib/lang/class_list.cc \
+                $(MAINSRCDIR)/lib/math/vector.cc \
+                $(MAINSRCDIR)/lib/util/color.cc \
+                $(MAINSRCDIR)/lib/coord/p_node.cc \
+                $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc \
+                \
+                $(MAINSRCDIR)/lib/network/synchronizeable.cc \
+                $(MAINSRCDIR)/lib/network/data_stream.cc \
+                $(MAINSRCDIR)/lib/network/network_stream.cc \
+                $(MAINSRCDIR)/lib/network/converter.cc \
+                \
+                $(MAINSRCDIR)/world_entities/world_entity.cc \
+                $(MAINSRCDIR)/world_entities/camera.cc \
+                collision_test_entity.cc
 
 noinst_HEADERS  =  collision_test_entity.h