Changeset 5687 in orxonox.OLD for trunk/src/subprojects

Timestamp:

Nov 21, 2005, 11:14:39 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: subproject collision_detection works again, and again, and again

Location:

trunk/src/subprojects/collision_detection

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• collision_test_entity.cc (modified) (1 diff)

trunk/src/subprojects/collision_detection/Makefile.am

@@ -6 +6 @@
 
 collision_LDADD = $(MAINSRCDIR)/util/libORXutils.a \
+                  $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
+                  $(MAINSRCDIR)/lib/libORXlibs.a \
                   $(MAINSRCDIR)/lib/physics/libORXphysics.a \
-                  $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
                   $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
                   $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \

trunk/src/subprojects/collision_detection/Makefile.in

@@ -66 +66 @@
 am__DEPENDENCIES_1 =
 collision_DEPENDENCIES = $(MAINSRCDIR)/util/libORXutils.a \
+        $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
+        $(MAINSRCDIR)/lib/libORXlibs.a \
         $(MAINSRCDIR)/lib/physics/libORXphysics.a \
-        $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
         $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
         $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
@@ -202 +203 @@
 MAINSRCDIR = ../..
 collision_LDADD = $(MAINSRCDIR)/util/libORXutils.a \
+                  $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
+                  $(MAINSRCDIR)/lib/libORXlibs.a \
                   $(MAINSRCDIR)/lib/physics/libORXphysics.a \
-                  $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
                   $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
                   $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \

trunk/src/subprojects/collision_detection/collision_test_entity.cc

@@ -34 +34 @@
 {
   this->init();
-  this->loadModel("models/ships/fighter.obj");
+  this->loadModel("models/ships/reaplow.obj");
+  //  this->loadModel("models/ships/figther.obj");
 
   this->buildObbTree(10);