Changeset 4217 in orxonox.OLD for orxonox/branches/movie_player/src/lib/gui/gui/Makefile.am

Timestamp:

May 18, 2005, 11:27:40 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/movie_player: merged the trunk back into the movie_player
merged with command:
svn merge -r 4014:HEAD ../trunk/ movie_player/
no conflicts

File:

• orxonox/branches/movie_player/src/lib/gui/gui/Makefile.am (modified) (3 diffs)

orxonox/branches/movie_player/src/lib/gui/gui/Makefile.am

@@ -7 +7 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/coord
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/font
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
@@ -19 +18 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/util
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
 
 #AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
@@ -24 +26 @@
 
 bin_PROGRAMS=gui
-gui_SOURCES=orxonox_gui.cc \
-            orxonox_gui_gtk.cc \
-            orxonox_gui_video.cc \
-            orxonox_gui_audio.cc \
-            orxonox_gui_exec.cc \
-            orxonox_gui_flags.cc \
-            orxonox_gui_banner.cc \
-            orxonox_gui_keys.cc \
-            orxonox_gui_update.cc
+gui_SOURCES=gui_main.cc \
+            gui.cc \
+            gui_gtk.cc \
+            gui_element.cc \
+            gui_video.cc \
+            gui_audio.cc \
+            gui_exec.cc \
+            gui_flags.cc \
+            gui_banner.cc \
+            gui_keys.cc \
+            gui_update.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/graphics/importer/array.cc \
+                  $(MAINSRCDIR)/lib/graphics/importer/model.cc \
+                  $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
+                  $(MAINSRCDIR)/lib/graphics/importer/material.cc \
+                  $(MAINSRCDIR)/lib/graphics/importer/texture.cc \
+                  $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc 
 
-noinst_HEADERS=orxonox_gui.h \
-            orxonox_gui_gtk.h \
-            orxonox_gui_video.h \
-            orxonox_gui_audio.h \
-            orxonox_gui_exec.h \
-            orxonox_gui_flags.h \
-            orxonox_gui_banner.h \
-            orxonox_gui_keys.h \
-            orxonox_gui_update.h
+noinst_HEADERS=gui.h \
+            gui_gtk.h \
+            gui_element.h \
+            gui_video.h \
+            gui_audio.h \
+            gui_exec.h \
+            gui_flags.h \
+            gui_banner.h \
+            gui_keys.h \
+            gui_update.h
 
 #  uncomment the following if orxonox requires the mathlibrary