Changeset 3790 in orxonox.OLD for orxonox/trunk/src/Makefile.am

Timestamp:

Apr 13, 2005, 12:33:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the textEngine back into the trunk.
merged with command:
svn merge -r 3681:HEAD branches/textEngine/ trunk/

conflicts in:
world.cc/h orxonox.cc NEWS
changed in favor of the trunk

File:

• orxonox/trunk/src/Makefile.am (modified) (5 diffs)

orxonox/trunk/src/Makefile.am

@@ -7 +7 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
-AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/font
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
@@ -34 +33 @@
                  track_manager.cc \
                  track_node.cc \
+                 animation.cc \
                  simple_animation.cc \
                  garbage_collector.cc \
@@ -57 +57 @@
                  lib/graphics/graphics_engine.cc \
                  lib/graphics/light.cc \
-                 lib/graphics/font/fontset.cc \
+                 lib/graphics/text_engine.cc \
                  lib/graphics/importer/array.cc \
                  lib/graphics/importer/objModel.cc \
@@ -83 +83 @@
                  track_manager.h \
                  track_node.h \
+                 animation.h \
                  simple_animation.h \
                  garbage_collector.h \
@@ -114 +115 @@
                  lib/graphics/graphics_engine.h \
                  lib/graphics/light.h \
-                 lib/graphics/font/fontset.h \
+                 lib/graphics/text_engine.h \
                  lib/data/data_tank.h \
                  lib/lang/base_entity.h \