Changeset 7156 in orxonox.OLD for trunk/src/subprojects/importer

Timestamp:

Feb 16, 2006, 3:09:39 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: collision_subproject should link again… can't test it, because the subproject is BORK…

File:

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

trunk/src/subprojects/importer/Makefile.am

@@ -12 +12 @@
 bin_PROGRAMS = \
                 importer \
-                multitex \
-                movie_player_test
+                multitex
+#               movie_player_test
 
-importer_DEPENDECIES = \
+DEPENDENCIES = \
                 $(MAINSRCDIR)/world_entities/libORXwe.a \
                 $(libORXlibs_a_LIBRARIES_) \
                 $(MAINSRCDIR)/util/libORXutils.a
 
-importer_LDADD = \
+LDADD = \
                 $(MAINSRCDIR)/util/libORXutils.a \
                 $(libORXlibs_a_LIBRARIES_) \
@@ -37 +37 @@
                 ../framework.cc \
                 multitex.cc \
-                $(MAINSRCDIR)/world_entities/camera.cc
+                $(MAINSRCDIR)/world_entities/space_ships/space_ship.cc \
+                $(MAINSRCDIR)/world_entities/weapons/test_gun.cc
 
-movie_player_test_SOURCES= \
-                ../framework.cc \
-                movie_player_test.cc \
-                $(MAINSRCDIR)/world_entities/camera.cc
+# movie_player_test_SOURCES= \
+#               ../framework.cc \
+#               movie_player_test.cc \
+#               $(MAINSRCDIR)/world_entities/space_ships/space_ship.cc \
+#               $(MAINSRCDIR)/world_entities/weapons/test_gun.cc