Changeset 4493 in orxonox.OLD for orxonox/trunk/src/subprojects/particles/Makefile.in

Timestamp:

Jun 3, 2005, 2:10:47 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: inheritSpeed now property of particle_emitter. system not friend emitter anymore

File:

• orxonox/trunk/src/subprojects/particles/Makefile.in (modified) (3 diffs)

orxonox/trunk/src/subprojects/particles/Makefile.in

@@ -68 +68 @@
 am__DEPENDENCIES_1 =
 particles_DEPENDENCIES = $(MAINSRCDIR)/lib/physics/libORXphysics.a \
-        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+        $(MAINSRCDIR)/lib/event/libORXevent.a \
+        $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a $(am__DEPENDENCIES_1) \
+        $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -214 +216 @@
 MAINSRCDIR = ../..
 particles_LDADD = $(MAINSRCDIR)/lib/physics/libORXphysics.a \
+                  $(MAINSRCDIR)/lib/event/libORXevent.a \
+                  $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
                   $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
                   -lpthread
@@ -222 +226 @@
 particles_SOURCES = ../framework.cc \
                    particle_fun.cc \
-                  $(MAINSRCDIR)/lib/particles/particle_engine.cc \
-                  $(MAINSRCDIR)/lib/particles/particle_system.cc \
-                  $(MAINSRCDIR)/lib/particles/particle_emitter.cc \
-                  $(MAINSRCDIR)/lib/graphics/light.cc \
-                  $(MAINSRCDIR)/util/state.cc \
-                  $(MAINSRCDIR)/world_entities/camera.cc \
-                  $(MAINSRCDIR)/lib/graphics/importer/model.cc \
-                  $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
-                  $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc \
-                  $(MAINSRCDIR)/lib/graphics/importer/array.cc \
-                  $(MAINSRCDIR)/lib/graphics/importer/material.cc \
-                  $(MAINSRCDIR)/lib/graphics/importer/texture.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 \
-                  $(MAINSRCDIR)/lib/gui/gui_gtk.cc
+                   $(MAINSRCDIR)/lib/particles/particle_engine.cc \
+                   $(MAINSRCDIR)/lib/particles/particle_system.cc \
+                   $(MAINSRCDIR)/lib/particles/particle_emitter.cc \
+                   $(MAINSRCDIR)/lib/graphics/light.cc \
+                   $(MAINSRCDIR)/util/state.cc \
+                   $(MAINSRCDIR)/world_entities/camera.cc \
+                   $(MAINSRCDIR)/lib/graphics/importer/model.cc \
+                   $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
+                   $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc \
+                   $(MAINSRCDIR)/lib/graphics/importer/array.cc \
+                   $(MAINSRCDIR)/lib/graphics/importer/material.cc \
+                   $(MAINSRCDIR)/lib/graphics/importer/texture.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 \
+                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc
 
 all: all-am