Changeset 5413 in orxonox.OLD for trunk/src/subprojects/collision_detection/Makefile.am

Timestamp:

Oct 20, 2005, 11:42:08 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: reverted to old revision 5409, removing the LIBTOOL-stuff with command:
svn merge . . -r HEAD:5409

Reason:
Timing:
Default:

---

real 1m1.111s
user 1m31.534s
sys 0m6.903s

LIBTOOL:

---

real 2m21.384s
user 3m12.141s
sys 0m36.896s

→ compileTime doubled

File:

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

trunk/src/subprojects/collision_detection/Makefile.am

@@ -5 +5 @@
 bin_PROGRAMS = collision
 
-collision_LDADD = ${MAINSRCDIR}/lib/libORXlibs.la \
-                  ${MAINSRCDIR}/util/libORXutils.la \
+collision_LDADD = $(MAINSRCDIR)/lib/physics/libORXphysics.a \
+                  $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
+                  $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
+                  $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
+                  $(MAINSRCDIR)/lib/shell/libORXshell.a \
+                  $(MAINSRCDIR)/lib/event/libORXevent.a \
+                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
+                  $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                  $(MAINSRCDIR)/lib/graphics/spatial_separation/libORXquadtree.a \
                   $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
@@ -16 +23 @@
 collision_SOURCES= ../framework.cc \
                    collision_detection.cc \
+                   $(MAINSRCDIR)/util/loading/load_param.cc \
+                   $(MAINSRCDIR)/lib/util/helper_functions.cc \
+                   $(MAINSRCDIR)/lib/util/substring.cc \
+                   $(MAINSRCDIR)/lib/util/ini_parser.cc \
+                   $(MAINSRCDIR)/world_entities/camera.cc \
+                   $(MAINSRCDIR)/util/state.cc \
+                   $(MAINSRCDIR)/lib/lang/base_object.cc \
+                   $(MAINSRCDIR)/lib/lang/class_list.cc \
+                   $(MAINSRCDIR)/lib/math/vector.cc \
+                   $(MAINSRCDIR)/lib/util/color.cc \
                    $(MAINSRCDIR)/util/resource_manager.cc \
-                   $(MAINSRCDIR)/world_entities/camera.cc \
+                   $(MAINSRCDIR)/lib/coord/p_node.cc \
+                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
+                   $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc \
                    $(MAINSRCDIR)/world_entities/test_entity.cc \
                    $(MAINSRCDIR)/world_entities/environment.cc \
+                   $(MAINSRCDIR)/util/animation/animation.cc \
+                   $(MAINSRCDIR)/util/animation/animation_player.cc \
+                   $(MAINSRCDIR)/util/animation/animation3d.cc \
+                   $(MAINSRCDIR)/util/loading/factory.cc \
                    $(MAINSRCDIR)/world_entities/world_entity.cc \
                    $(MAINSRCDIR)/world_entities/terrain.cc