Changeset 5558 in orxonox.OLD for branches/world_entities/src/subprojects/collision_detection/Makefile.am

Timestamp:

Nov 13, 2005, 3:10:49 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/world_entities: merged the Trunk to the world_entities branche
merged with command
svn merge -r5516:HEAD ../trunk/ world_entities/
no conflicts

File:

• branches/world_entities/src/subprojects/collision_detection/Makefile.am (modified) (3 diffs)

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

@@ -5 +5 @@
 bin_PROGRAMS = collision
 
-collision_LDADD = $(MAINSRCDIR)/lib/physics/libORXphysics.a \
+collision_LDADD = $(MAINSRCDIR)/util/libORXutils.a \
+                  $(MAINSRCDIR)/lib/physics/libORXphysics.a \
                   $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
                   $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
@@ -24 +25 @@
                    collision_detection.cc \
                    \
-                   $(MAINSRCDIR)/util/loading/factory.cc \
-                   $(MAINSRCDIR)/util/loading/resource_manager.cc \
-                   $(MAINSRCDIR)/util/loading/load_param.cc \
-                   $(MAINSRCDIR)/util/animation/animation.cc \
-                   $(MAINSRCDIR)/util/animation/animation_player.cc \
-                   $(MAINSRCDIR)/util/animation/animation3d.cc \
-                   $(MAINSRCDIR)/util/state.cc \
-                   \
                    $(MAINSRCDIR)/lib/util/helper_functions.cc \
                    $(MAINSRCDIR)/lib/util/substring.cc \
@@ -47 +40 @@
                    collision_test_entity.cc
 
-noinst_HEADERS  =  collision_test_entity.h 
+noinst_HEADERS  =  collision_test_entity.h