Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3491 in orxonox.OLD for orxonox


Ignore:
Timestamp:
Mar 11, 2005, 1:56:47 AM (20 years ago)
Author:
patrick
Message:

orxonox/trunk: fixed a bug in the conf files

Location:
orxonox/trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/Makefile.am

    r3490 r3491  
    77AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
    88AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
    9 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics/font
     9AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/font
    1010AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
    1111AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
     
    4646                 lib/coord/helper_parent.cc \
    4747                 lib/data/data_tank.cc \
    48                  lib/graphics/font/fontset.cc
     48                 lib/graphics/font/fontset.cc \
    4949                 lib/graphics/importer/array.cc \
    5050                 lib/graphics/importer/objModel.cc \
     
    5959                 lib/math/matrix.cc \
    6060                 lib/math/curve.cc \
    61                  glmenu/glmenu_imagescreen.cc \
     61                 glmenu/glmenu_imagescreen.cc
    6262
    6363noinst_HEADERS = orxonox.h \
     
    9292                 lib/coord/null_parent.h \
    9393                 lib/coord/helper_parent.h \
    94                  lib/graphics/font/fontset.h
     94                 lib/graphics/font/fontset.h \
    9595                 lib/data/data_tank.h \
    9696                 lib/lang/base_entity.h \
     
    102102                 lib/math/matrix.h \
    103103                 lib/math/curve.h \
    104                  glmenu/glmenu_imagescreen.h \
     104                 glmenu/glmenu_imagescreen.h
    105105
    106106
  • orxonox/trunk/src/Makefile.in

    r3489 r3491  
    5959        player.$(OBJEXT) environment.$(OBJEXT) skysphere.$(OBJEXT) \
    6060        ai.$(OBJEXT) p_node.$(OBJEXT) null_parent.$(OBJEXT) \
    61         helper_parent.$(OBJEXT) data_tank.$(OBJEXT) array.$(OBJEXT) \
    62         objModel.$(OBJEXT) model.$(OBJEXT) material.$(OBJEXT) \
    63         texture.$(OBJEXT) base_entity.$(OBJEXT) base_object.$(OBJEXT) \
    64         ini_parser.$(OBJEXT) list.$(OBJEXT) vector.$(OBJEXT) \
    65         matrix.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
    66         fontset.$(OBJEXT)
     61        helper_parent.$(OBJEXT) data_tank.$(OBJEXT) fontset.$(OBJEXT) \
     62        array.$(OBJEXT) objModel.$(OBJEXT) model.$(OBJEXT) \
     63        material.$(OBJEXT) texture.$(OBJEXT) base_entity.$(OBJEXT) \
     64        base_object.$(OBJEXT) ini_parser.$(OBJEXT) list.$(OBJEXT) \
     65        vector.$(OBJEXT) matrix.$(OBJEXT) curve.$(OBJEXT) \
     66        glmenu_imagescreen.$(OBJEXT)
    6767orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    6868orxonox_LDADD = $(LDADD)
     
    215215target_vendor = @target_vendor@
    216216MAINSRCDIR = .
    217 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
     217AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/font -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
    218218AM_LDFLAGS = $(MWINDOWS)
    219219orxonox_SOURCES = orxonox.cc \
     
    236236                 lib/coord/helper_parent.cc \
    237237                 lib/data/data_tank.cc \
     238                 lib/graphics/font/fontset.cc \
    238239                 lib/graphics/importer/array.cc \
    239240                 lib/graphics/importer/objModel.cc \
     
    248249                 lib/math/matrix.cc \
    249250                 lib/math/curve.cc \
    250                  glmenu/glmenu_imagescreen.cc \
    251                  font/fontset.cc
     251                 glmenu/glmenu_imagescreen.cc
    252252
    253253noinst_HEADERS = orxonox.h \
     
    282282                 lib/coord/null_parent.h \
    283283                 lib/coord/helper_parent.h \
     284                 lib/graphics/font/fontset.h \
    284285                 lib/data/data_tank.h \
    285286                 lib/lang/base_entity.h \
     
    291292                 lib/math/matrix.h \
    292293                 lib/math/curve.h \
    293                  glmenu/glmenu_imagescreen.h \
    294                  font/fontset.h
     294                 glmenu/glmenu_imagescreen.h
    295295
    296296EXTRA_DIST = orxonox.conf
     
    613613@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o data_tank.obj `if test -f 'lib/data/data_tank.cc'; then $(CYGPATH_W) 'lib/data/data_tank.cc'; else $(CYGPATH_W) '$(srcdir)/lib/data/data_tank.cc'; fi`
    614614
     615fontset.o: lib/graphics/font/fontset.cc
     616@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fontset.o -MD -MP -MF "$(DEPDIR)/fontset.Tpo" -c -o fontset.o `test -f 'lib/graphics/font/fontset.cc' || echo '$(srcdir)/'`lib/graphics/font/fontset.cc; \
     617@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/fontset.Tpo" "$(DEPDIR)/fontset.Po"; else rm -f "$(DEPDIR)/fontset.Tpo"; exit 1; fi
     618@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/font/fontset.cc' object='fontset.o' libtool=no @AMDEPBACKSLASH@
     619@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/fontset.Po' tmpdepfile='$(DEPDIR)/fontset.TPo' @AMDEPBACKSLASH@
     620@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     621@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fontset.o `test -f 'lib/graphics/font/fontset.cc' || echo '$(srcdir)/'`lib/graphics/font/fontset.cc
     622
     623fontset.obj: lib/graphics/font/fontset.cc
     624@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fontset.obj -MD -MP -MF "$(DEPDIR)/fontset.Tpo" -c -o fontset.obj `if test -f 'lib/graphics/font/fontset.cc'; then $(CYGPATH_W) 'lib/graphics/font/fontset.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/font/fontset.cc'; fi`; \
     625@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/fontset.Tpo" "$(DEPDIR)/fontset.Po"; else rm -f "$(DEPDIR)/fontset.Tpo"; exit 1; fi
     626@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/font/fontset.cc' object='fontset.obj' libtool=no @AMDEPBACKSLASH@
     627@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/fontset.Po' tmpdepfile='$(DEPDIR)/fontset.TPo' @AMDEPBACKSLASH@
     628@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     629@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fontset.obj `if test -f 'lib/graphics/font/fontset.cc'; then $(CYGPATH_W) 'lib/graphics/font/fontset.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/font/fontset.cc'; fi`
     630
    615631array.o: lib/graphics/importer/array.cc
    616632@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT array.o -MD -MP -MF "$(DEPDIR)/array.Tpo" -c -o array.o `test -f 'lib/graphics/importer/array.cc' || echo '$(srcdir)/'`lib/graphics/importer/array.cc; \
     
    820836@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    821837@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o glmenu_imagescreen.obj `if test -f 'glmenu/glmenu_imagescreen.cc'; then $(CYGPATH_W) 'glmenu/glmenu_imagescreen.cc'; else $(CYGPATH_W) '$(srcdir)/glmenu/glmenu_imagescreen.cc'; fi`
    822 
    823 fontset.o: font/fontset.cc
    824 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fontset.o -MD -MP -MF "$(DEPDIR)/fontset.Tpo" -c -o fontset.o `test -f 'font/fontset.cc' || echo '$(srcdir)/'`font/fontset.cc; \
    825 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/fontset.Tpo" "$(DEPDIR)/fontset.Po"; else rm -f "$(DEPDIR)/fontset.Tpo"; exit 1; fi
    826 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='font/fontset.cc' object='fontset.o' libtool=no @AMDEPBACKSLASH@
    827 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/fontset.Po' tmpdepfile='$(DEPDIR)/fontset.TPo' @AMDEPBACKSLASH@
    828 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    829 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fontset.o `test -f 'font/fontset.cc' || echo '$(srcdir)/'`font/fontset.cc
    830 
    831 fontset.obj: font/fontset.cc
    832 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fontset.obj -MD -MP -MF "$(DEPDIR)/fontset.Tpo" -c -o fontset.obj `if test -f 'font/fontset.cc'; then $(CYGPATH_W) 'font/fontset.cc'; else $(CYGPATH_W) '$(srcdir)/font/fontset.cc'; fi`; \
    833 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/fontset.Tpo" "$(DEPDIR)/fontset.Po"; else rm -f "$(DEPDIR)/fontset.Tpo"; exit 1; fi
    834 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='font/fontset.cc' object='fontset.obj' libtool=no @AMDEPBACKSLASH@
    835 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/fontset.Po' tmpdepfile='$(DEPDIR)/fontset.TPo' @AMDEPBACKSLASH@
    836 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    837 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fontset.obj `if test -f 'font/fontset.cc'; then $(CYGPATH_W) 'font/fontset.cc'; else $(CYGPATH_W) '$(srcdir)/font/fontset.cc'; fi`
    838838uninstall-info-am:
    839839
     
    959959
    960960distdir: $(DISTFILES)
    961         $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/font $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/story_entities $(distdir)/world_entities
     961        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics/font $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/story_entities $(distdir)/world_entities
    962962        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    963963        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
Note: See TracChangeset for help on using the changeset viewer.