Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5342 in orxonox.OLD for trunk/src


Ignore:
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:
1 added
5 edited
3 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile.am

    r5315 r5342  
    7777                  lib/graphics/light.cc \
    7878                  lib/graphics/shader.cc \
    79                   lib/graphics/text_engine.cc \
     79                  lib/graphics/text_engine/text_engine.cc \
    8080                  lib/graphics/render2D/element_2d.cc \
    8181                  lib/graphics/render2D/render_2d.cc \
     
    150150                 lib/graphics/light.h \
    151151                 lib/graphics/shader.h \
    152                  lib/graphics/text_engine.h \
     152                 lib/graphics/text_engine/text_engine.h \
    153153                 lib/lang/base_object.h \
    154154                 lib/graphics/render2D/element_2d.h \
  • trunk/src/Makefile.in

    r5315 r5342  
    337337                  lib/graphics/light.cc \
    338338                  lib/graphics/shader.cc \
    339                   lib/graphics/text_engine.cc \
     339                  lib/graphics/text_engine/text_engine.cc \
    340340                  lib/graphics/render2D/element_2d.cc \
    341341                  lib/graphics/render2D/render_2d.cc \
     
    410410                 lib/graphics/light.h \
    411411                 lib/graphics/shader.h \
    412                  lib/graphics/text_engine.h \
     412                 lib/graphics/text_engine/text_engine.h \
    413413                 lib/lang/base_object.h \
    414414                 lib/graphics/render2D/element_2d.h \
     
    12451245@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`
    12461246
    1247 orxonox-text_engine.o: lib/graphics/text_engine.cc
    1248 @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; \
     1247orxonox-text_engine.o: lib/graphics/text_engine/text_engine.cc
     1248@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; \
    12491249@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
    1250 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/text_engine.cc' object='orxonox-text_engine.o' libtool=no @AMDEPBACKSLASH@
     1250@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/text_engine/text_engine.cc' object='orxonox-text_engine.o' libtool=no @AMDEPBACKSLASH@
    12511251@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-text_engine.Po' tmpdepfile='$(DEPDIR)/orxonox-text_engine.TPo' @AMDEPBACKSLASH@
    12521252@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1253 @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
    1254 
    1255 orxonox-text_engine.obj: lib/graphics/text_engine.cc
    1256 @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`; \
     1253@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
     1254
     1255orxonox-text_engine.obj: lib/graphics/text_engine/text_engine.cc
     1256@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`; \
    12571257@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
    1258 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/text_engine.cc' object='orxonox-text_engine.obj' libtool=no @AMDEPBACKSLASH@
     1258@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/text_engine/text_engine.cc' object='orxonox-text_engine.obj' libtool=no @AMDEPBACKSLASH@
    12591259@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-text_engine.Po' tmpdepfile='$(DEPDIR)/orxonox-text_engine.TPo' @AMDEPBACKSLASH@
    12601260@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1261 @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`
     1261@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`
    12621262
    12631263orxonox-element_2d.o: lib/graphics/render2D/element_2d.cc
     
    15591559
    15601560distdir: $(DISTFILES)
    1561         $(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
     1561        $(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
    15621562        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    15631563        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • trunk/src/defs/include_paths.am

    r5315 r5342  
    88AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/event
    99AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
     10AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/text_engine
    1011AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
    1112AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/spatial_separation
  • trunk/src/lib/graphics/Makefile.am

    r4789 r5342  
    11SUBDIRS = importer \
    22          spatial_separation
     3
     4EXTRA_DIST = text_engine/font.xpm
  • trunk/src/lib/graphics/Makefile.in

    r5315 r5342  
    167167          spatial_separation
    168168
     169EXTRA_DIST = text_engine/font.xpm
    169170all: all-recursive
    170171
     
    322323
    323324distdir: $(DISTFILES)
     325        $(mkdir_p) $(distdir)/text_engine
    324326        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    325327        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
Note: See TracChangeset for help on using the changeset viewer.