Changeset 4532 in orxonox.OLD

Timestamp:

Jun 7, 2005, 9:23:57 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: subproject for collision_detection now really cleaned

File:

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

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

@@ -3 +3 @@
 
 
-bin_PROGRAMS = particles
+bin_PROGRAMS = collision
 
-particles_LDADD = $(MAINSRCDIR)/lib/physics/libORXphysics.a \
+collision_LDADD = $(MAINSRCDIR)/lib/physics/libORXphysics.a \
                   $(MAINSRCDIR)/lib/event/libORXevent.a \
+                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
                   $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
                   -lpthread
 
-particles_CPPFLAGS =  -DGUI_MODULE \
+collision_CPPFLAGS =  -DGUI_MODULE \
                       $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
 
-particles_SOURCES= ../framework.cc \
+collision_SOURCES= ../framework.cc \
                    collision_detection.cc \
-                   $(MAINSRCDIR)/lib/particles/particle_engine.cc \
-                   $(MAINSRCDIR)/lib/particles/particle_system.cc \
-                   $(MAINSRCDIR)/lib/particles/particle_emitter.cc \
+                   $(MAINSRCDIR)/util/loading/load_param.cc \
+                   $(MAINSRCDIR)/lib/util/ini_parser.cc \
                    $(MAINSRCDIR)/lib/graphics/light.cc \
                    $(MAINSRCDIR)/util/state.cc \
@@ -28 +28 @@
                    $(MAINSRCDIR)/lib/graphics/importer/material.cc \
                    $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
+                   $(MAINSRCDIR)/lib/graphics/importer/md2Model.cc \
                    $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
                    $(MAINSRCDIR)/lib/lang/base_object.cc \