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

Timestamp:

Jun 13, 2005, 9:17:55 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now bounding box gets displayed very well

File:

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

orxonox/trunk/src/subprojects/collision_detection/Makefile.am

@@ -6 +6 @@
 
 collision_LDADD = $(MAINSRCDIR)/lib/physics/libORXphysics.a \
-                  $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
                   $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
                   $(MAINSRCDIR)/lib/event/libORXevent.a \
@@ -23 +22 @@
                    $(MAINSRCDIR)/lib/util/substring.cc \
                    $(MAINSRCDIR)/lib/util/ini_parser.cc \
+                   $(MAINSRCDIR)/world_entities/camera.cc \
                    $(MAINSRCDIR)/lib/graphics/light.cc \
+                   $(MAINSRCDIR)/lib/graphics/importer/material.cc \
+                   $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
+                   $(MAINSRCDIR)/lib/graphics/importer/material.h \
+                   $(MAINSRCDIR)/lib/graphics/importer/model.cc \
+                   $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
                    $(MAINSRCDIR)/lib/graphics/importer/md2Model.cc \
+                   $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc \
+                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
+                   $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
                    $(MAINSRCDIR)/util/state.cc \
-                   $(MAINSRCDIR)/world_entities/camera.cc \
-                   $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
                    $(MAINSRCDIR)/lib/lang/base_object.cc \
                    $(MAINSRCDIR)/lib/math/vector.cc \
                    $(MAINSRCDIR)/util/resource_manager.cc \
-                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
                    $(MAINSRCDIR)/lib/coord/p_node.cc \
                    $(MAINSRCDIR)/lib/coord/null_parent.cc \