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

Timestamp:

Nov 24, 2005, 12:13:22 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

Location:

trunk/src/subprojects

Files:

• benchmark.cc (modified) (1 diff)
• collision_detection/Makefile.am (modified) (1 diff)
• collision_detection/collision_test_entity.cc (modified) (1 diff)
• importer/Makefile.am (modified) (1 diff)

trunk/src/subprojects/benchmark.cc

@@ -36 +36 @@
 #include <stdlib.h>
 #include <asm/msr.h>
-#include <linux/timex.h>
+//#include <linux/timex.h>
 
 

trunk/src/subprojects/collision_detection/Makefile.am

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

trunk/src/subprojects/collision_detection/collision_test_entity.cc

@@ -26 +26 @@
 
 using namespace std;
-CREATE_FACTORY(CollisionTestEntity);
+CREATE_FACTORY(CollisionTestEntity, CL_ENVIRONMENT);
 
 /**

trunk/src/subprojects/importer/Makefile.am

@@ -31 +31 @@
                   $(MAINSRCDIR)/lib/util/substring.cc \
                   $(MAINSRCDIR)/lib/util/color.cc \
+                  $(MAINSRCDIR)/lib/util/multi_type.cc \
                   $(MAINSRCDIR)/util/loading/factory.cc