Changeset 3490 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Mar 11, 2005, 1:15:33 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: moved font to lib/graphics/font

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (5 diffs)
• lib/graphics/font (moved) (moved from orxonox/trunk/src/font)

orxonox/trunk/src/Makefile.am

@@ -7 +7 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics/font
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
@@ -45 +46 @@
                  lib/coord/helper_parent.cc \
                  lib/data/data_tank.cc \
+                 lib/graphics/font/fontset.cc 
                  lib/graphics/importer/array.cc \
                  lib/graphics/importer/objModel.cc \
@@ -58 +60 @@
                  lib/math/curve.cc \
                  glmenu/glmenu_imagescreen.cc \
-                 font/fontset.cc 
 
 noinst_HEADERS = orxonox.h \
@@ -91 +92 @@
                  lib/coord/null_parent.h \
                  lib/coord/helper_parent.h \
+                 lib/graphics/font/fontset.h
                  lib/data/data_tank.h \
                  lib/lang/base_entity.h \
@@ -101 +103 @@
                  lib/math/curve.h \
                  glmenu/glmenu_imagescreen.h \
-                 font/fontset.h
+
 
 ## orxonox.conf will be used from home-dir instead.