Changeset 6532 in orxonox.OLD for trunk/src/subprojects/importer/Makefile.am

Timestamp:

Jan 18, 2006, 1:20:02 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/movie_play to the trunk. no conflicts, but a minor virtual function BUG

File:

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

trunk/src/subprojects/importer/Makefile.am

@@ -7 +7 @@
 
 bin_PROGRAMS = importer \
-               multitex
+               multitex \
+                                                         movie_player_test
 
 importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
@@ -63 +64 @@
                   $(MAINSRCDIR)/lib/util/executor/executor.cc \
                   $(MAINSRCDIR)/util/loading/factory.cc
+
+movie_player_test_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
+                                                        $(MAINSRCDIR)/lib/parser/tinyxml/libtinyxml.a \
+                                                        $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
+                                                        $(MAINSRCDIR)/lib/shell/libORXshell.a \
+                                                        $(MAINSRCDIR)/lib/sound/libORXsound.a \
+                                                        $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
+
+movie_player_test_SOURCES= ../framework.cc \
+                                                 movie_player_test.cc \
+                                                 $(MAINSRCDIR)/util/state.cc \
+                                                 $(MAINSRCDIR)/world_entities/camera.cc \
+                                                 $(MAINSRCDIR)/lib/lang/base_object.cc \
+                                                                                                         $(MAINSRCDIR)/lib/lang/class_list.cc \
+                                                                                                         $(MAINSRCDIR)/lib/math/vector.cc \
+                                                                                                         $(MAINSRCDIR)/util/loading/resource_manager.cc \
+                                                                                                         $(MAINSRCDIR)/lib/parser/ini_parser/ini_parser.cc \
+                                                                                                         $(MAINSRCDIR)/lib/coord/p_node.cc \
+                                                                                                         $(MAINSRCDIR)/lib/coord/null_parent.cc \
+                                                                                                         $(MAINSRCDIR)/util/loading/load_param.cc \
+                                                                                                         $(MAINSRCDIR)/util/loading/load_param_description.cc \
+                                                                                                         $(MAINSRCDIR)/lib/util/helper_functions.cc \
+                                                                                                         $(MAINSRCDIR)/lib/util/substring.cc \
+                                                                                                         $(MAINSRCDIR)/lib/util/color.cc \
+                                                                                                         $(MAINSRCDIR)/lib/util/multi_type.cc \
+                                                                                                         $(MAINSRCDIR)/lib/util/executor/executor.cc \
+                                                                                                         $(MAINSRCDIR)/util/loading/factory.cc