Changeset 5342 in orxonox.OLD

Timestamp:

Oct 9, 2005, 11:52:21 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved text_engine to src/lib/graphics/text_engine subfolder.
now splitting the Stuff into text, font and text_engine

Location:

trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (4 diffs)
• defs/include_paths.am (modified) (1 diff)
• lib/graphics/Makefile.am (modified) (1 diff)
• lib/graphics/Makefile.in (modified) (2 diffs)
• lib/graphics/text_engine (added)
• lib/graphics/text_engine/font.xpm (moved) (moved from trunk/src/lib/graphics/font.xpm)
• lib/graphics/text_engine/text_engine.cc (moved) (moved from trunk/src/lib/graphics/text_engine.cc)
• lib/graphics/text_engine/text_engine.h (moved) (moved from trunk/src/lib/graphics/text_engine.h)

trunk/src/Makefile.am

@@ -77 +77 @@
                   lib/graphics/light.cc \
                   lib/graphics/shader.cc \
-                  lib/graphics/text_engine.cc \
+                  lib/graphics/text_engine/text_engine.cc \
                   lib/graphics/render2D/element_2d.cc \
                   lib/graphics/render2D/render_2d.cc \
@@ -150 +150 @@
                  lib/graphics/light.h \
                  lib/graphics/shader.h \
-                 lib/graphics/text_engine.h \
+                 lib/graphics/text_engine/text_engine.h \
                  lib/lang/base_object.h \
                  lib/graphics/render2D/element_2d.h \

trunk/src/Makefile.in

@@ -337 +337 @@
                   lib/graphics/light.cc \
                   lib/graphics/shader.cc \
-                  lib/graphics/text_engine.cc \
+                  lib/graphics/text_engine/text_engine.cc \
                   lib/graphics/render2D/element_2d.cc \
                   lib/graphics/render2D/render_2d.cc \
@@ -410 +410 @@
                  lib/graphics/light.h \
                  lib/graphics/shader.h \
-                 lib/graphics/text_engine.h \
+                 lib/graphics/text_engine/text_engine.h \
                  lib/lang/base_object.h \
                  lib/graphics/render2D/element_2d.h \
@@ -1245 +1245 @@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-shader.obj `if test -f 'lib/graphics/shader.cc'; then $(CYGPATH_W) 'lib/graphics/shader.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/shader.cc'; fi`
 
-orxonox-text_engine.o: lib/graphics/text_engine.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-text_engine.o -MD -MP -MF "$(DEPDIR)/orxonox-text_engine.Tpo" -c -o orxonox-text_engine.o `test -f 'lib/graphics/text_engine.cc' || echo '$(srcdir)/'`lib/graphics/text_engine.cc; \
+orxonox-text_engine.o: lib/graphics/text_engine/text_engine.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-text_engine.o -MD -MP -MF "$(DEPDIR)/orxonox-text_engine.Tpo" -c -o orxonox-text_engine.o `test -f 'lib/graphics/text_engine/text_engine.cc' || echo '$(srcdir)/'`lib/graphics/text_engine/text_engine.cc; \
 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-text_engine.Tpo" "$(DEPDIR)/orxonox-text_engine.Po"; else rm -f "$(DEPDIR)/orxonox-text_engine.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/text_engine.cc' object='orxonox-text_engine.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/text_engine/text_engine.cc' object='orxonox-text_engine.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-text_engine.Po' tmpdepfile='$(DEPDIR)/orxonox-text_engine.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-text_engine.o `test -f 'lib/graphics/text_engine.cc' || echo '$(srcdir)/'`lib/graphics/text_engine.cc
-
-orxonox-text_engine.obj: lib/graphics/text_engine.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-text_engine.obj -MD -MP -MF "$(DEPDIR)/orxonox-text_engine.Tpo" -c -o orxonox-text_engine.obj `if test -f 'lib/graphics/text_engine.cc'; then $(CYGPATH_W) 'lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/text_engine.cc'; fi`; \
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-text_engine.o `test -f 'lib/graphics/text_engine/text_engine.cc' || echo '$(srcdir)/'`lib/graphics/text_engine/text_engine.cc
+
+orxonox-text_engine.obj: lib/graphics/text_engine/text_engine.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-text_engine.obj -MD -MP -MF "$(DEPDIR)/orxonox-text_engine.Tpo" -c -o orxonox-text_engine.obj `if test -f 'lib/graphics/text_engine/text_engine.cc'; then $(CYGPATH_W) 'lib/graphics/text_engine/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/text_engine/text_engine.cc'; fi`; \
 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-text_engine.Tpo" "$(DEPDIR)/orxonox-text_engine.Po"; else rm -f "$(DEPDIR)/orxonox-text_engine.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/text_engine.cc' object='orxonox-text_engine.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/text_engine/text_engine.cc' object='orxonox-text_engine.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-text_engine.Po' tmpdepfile='$(DEPDIR)/orxonox-text_engine.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-text_engine.obj `if test -f 'lib/graphics/text_engine.cc'; then $(CYGPATH_W) 'lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/text_engine.cc'; fi`
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-text_engine.obj `if test -f 'lib/graphics/text_engine/text_engine.cc'; then $(CYGPATH_W) 'lib/graphics/text_engine/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/text_engine/text_engine.cc'; fi`
 
 orxonox-element_2d.o: lib/graphics/render2D/element_2d.cc
@@ -1559 +1559 @@
 
 distdir: $(DISTFILES)
-        $(mkdir_p) $(distdir)/defs $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/render2D $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities $(distdir)/world_entities/weapons
+        $(mkdir_p) $(distdir)/defs $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/render2D $(distdir)/lib/graphics/text_engine $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities $(distdir)/world_entities/weapons
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

trunk/src/defs/include_paths.am

@@ -8 +8 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/event
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/text_engine
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/spatial_separation

trunk/src/lib/graphics/Makefile.am

@@ -1 +1 @@
 SUBDIRS = importer \
           spatial_separation
+
+EXTRA_DIST = text_engine/font.xpm

trunk/src/lib/graphics/Makefile.in

@@ -167 +167 @@
           spatial_separation
 
+EXTRA_DIST = text_engine/font.xpm
 all: all-recursive
 
@@ -322 +323 @@
 
 distdir: $(DISTFILES)
+        $(mkdir_p) $(distdir)/text_engine
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \