Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5031 in orxonox.OLD for orxonox/trunk/src/subprojects


Ignore:
Timestamp:
Aug 15, 2005, 9:39:51 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: made the IniParser more standAlone
also fixed all remaing SubProjects, so they compile again

Location:
orxonox/trunk/src/subprojects
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/subprojects/importer/Makefile.am

    r4908 r5031  
    3131                  $(MAINSRCDIR)/util/loading/load_param.cc \
    3232                  $(MAINSRCDIR)/lib/util/substring.cc \
     33                  $(MAINSRCDIR)/lib/util/color.cc \
    3334                  $(MAINSRCDIR)/util/loading/factory.cc

  • orxonox/trunk/src/subprojects/importer/Makefile.in

    r4908 r5031  
    6161        importer-p_node.$(OBJEXT) importer-null_parent.$(OBJEXT) \
    6262        importer-load_param.$(OBJEXT) importer-substring.$(OBJEXT) \
    63         importer-factory.$(OBJEXT)
     63        importer-color.$(OBJEXT) importer-factory.$(OBJEXT)
    6464importer_OBJECTS = $(am_importer_OBJECTS)
    6565importer_DEPENDENCIES = $(MAINSRCDIR)/lib/event/libORXevent.a \
    … …  
    7373@AMDEP_TRUE@    ./$(DEPDIR)/importer-camera.Po \
    7474@AMDEP_TRUE@    ./$(DEPDIR)/importer-class_list.Po \
     75@AMDEP_TRUE@    ./$(DEPDIR)/importer-color.Po \
    7576@AMDEP_TRUE@    ./$(DEPDIR)/importer-element_2d.Po \
    7677@AMDEP_TRUE@    ./$(DEPDIR)/importer-factory.Po \
    … …  
    233234                  $(MAINSRCDIR)/util/loading/load_param.cc \
    234235                  $(MAINSRCDIR)/lib/util/substring.cc \
     236                  $(MAINSRCDIR)/lib/util/color.cc \
    235237                  $(MAINSRCDIR)/util/loading/factory.cc
    236238
    … …  
    304306@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-camera.Po@am__quote@
    305307@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-class_list.Po@am__quote@
     308@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-color.Po@am__quote@
    306309@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-element_2d.Po@am__quote@
    307310@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-factory.Po@am__quote@
    … …  
    624627@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    625628@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-substring.obj `if test -f '$(MAINSRCDIR)/lib/util/substring.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/substring.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/substring.cc'; fi`
     629
     630importer-color.o: $(MAINSRCDIR)/lib/util/color.cc
     631@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-color.o -MD -MP -MF "$(DEPDIR)/importer-color.Tpo" -c -o importer-color.o `test -f '$(MAINSRCDIR)/lib/util/color.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/color.cc; \
     632@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/importer-color.Tpo" "$(DEPDIR)/importer-color.Po"; else rm -f "$(DEPDIR)/importer-color.Tpo"; exit 1; fi
     633@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/color.cc' object='importer-color.o' libtool=no @AMDEPBACKSLASH@
     634@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/importer-color.Po' tmpdepfile='$(DEPDIR)/importer-color.TPo' @AMDEPBACKSLASH@
     635@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     636@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-color.o `test -f '$(MAINSRCDIR)/lib/util/color.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/color.cc
     637
     638importer-color.obj: $(MAINSRCDIR)/lib/util/color.cc
     639@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-color.obj -MD -MP -MF "$(DEPDIR)/importer-color.Tpo" -c -o importer-color.obj `if test -f '$(MAINSRCDIR)/lib/util/color.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/color.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/color.cc'; fi`; \
     640@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/importer-color.Tpo" "$(DEPDIR)/importer-color.Po"; else rm -f "$(DEPDIR)/importer-color.Tpo"; exit 1; fi
     641@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/color.cc' object='importer-color.obj' libtool=no @AMDEPBACKSLASH@
     642@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/importer-color.Po' tmpdepfile='$(DEPDIR)/importer-color.TPo' @AMDEPBACKSLASH@
     643@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     644@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-color.obj `if test -f '$(MAINSRCDIR)/lib/util/color.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/color.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/color.cc'; fi`
    626645
    627646importer-factory.o: $(MAINSRCDIR)/util/loading/factory.cc

  • orxonox/trunk/src/subprojects/particles/Makefile.am

    r4908 r5031  
    3737                   $(MAINSRCDIR)/util/loading/load_param.cc \
    3838                   $(MAINSRCDIR)/util/loading/factory.cc \
     39                   $(MAINSRCDIR)/lib/util/color.cc \
    3940                   $(MAINSRCDIR)/lib/util/ini_parser.cc
    4041

  • orxonox/trunk/src/subprojects/particles/Makefile.in

    r4908 r5031  
    6363        particles-null_parent.$(OBJEXT) particles-gui_gtk.$(OBJEXT) \
    6464        particles-substring.$(OBJEXT) particles-load_param.$(OBJEXT) \
    65         particles-factory.$(OBJEXT) particles-ini_parser.$(OBJEXT)
     65        particles-factory.$(OBJEXT) particles-color.$(OBJEXT) \
     66        particles-ini_parser.$(OBJEXT)
    6667particles_OBJECTS = $(am_particles_OBJECTS)
    6768am__DEPENDENCIES_1 =
    … …  
    8081@AMDEP_TRUE@    ./$(DEPDIR)/particles-camera.Po \
    8182@AMDEP_TRUE@    ./$(DEPDIR)/particles-class_list.Po \
     83@AMDEP_TRUE@    ./$(DEPDIR)/particles-color.Po \
    8284@AMDEP_TRUE@    ./$(DEPDIR)/particles-element_2d.Po \
    8385@AMDEP_TRUE@    ./$(DEPDIR)/particles-factory.Po \
    … …  
    249251                   $(MAINSRCDIR)/util/loading/load_param.cc \
    250252                   $(MAINSRCDIR)/util/loading/factory.cc \
     253                   $(MAINSRCDIR)/lib/util/color.cc \
    251254                   $(MAINSRCDIR)/lib/util/ini_parser.cc
    252255
    … …  
    320323@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-camera.Po@am__quote@
    321324@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-class_list.Po@am__quote@
     325@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-color.Po@am__quote@
    322326@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-element_2d.Po@am__quote@
    323327@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-factory.Po@am__quote@
    … …  
    674678@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    675679@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-factory.obj `if test -f '$(MAINSRCDIR)/util/loading/factory.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/factory.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/factory.cc'; fi`
     680
     681particles-color.o: $(MAINSRCDIR)/lib/util/color.cc
     682@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-color.o -MD -MP -MF "$(DEPDIR)/particles-color.Tpo" -c -o particles-color.o `test -f '$(MAINSRCDIR)/lib/util/color.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/color.cc; \
     683@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-color.Tpo" "$(DEPDIR)/particles-color.Po"; else rm -f "$(DEPDIR)/particles-color.Tpo"; exit 1; fi
     684@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/color.cc' object='particles-color.o' libtool=no @AMDEPBACKSLASH@
     685@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-color.Po' tmpdepfile='$(DEPDIR)/particles-color.TPo' @AMDEPBACKSLASH@
     686@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     687@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-color.o `test -f '$(MAINSRCDIR)/lib/util/color.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/color.cc
     688
     689particles-color.obj: $(MAINSRCDIR)/lib/util/color.cc
     690@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-color.obj -MD -MP -MF "$(DEPDIR)/particles-color.Tpo" -c -o particles-color.obj `if test -f '$(MAINSRCDIR)/lib/util/color.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/color.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/color.cc'; fi`; \
     691@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-color.Tpo" "$(DEPDIR)/particles-color.Po"; else rm -f "$(DEPDIR)/particles-color.Tpo"; exit 1; fi
     692@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/color.cc' object='particles-color.obj' libtool=no @AMDEPBACKSLASH@
     693@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-color.Po' tmpdepfile='$(DEPDIR)/particles-color.TPo' @AMDEPBACKSLASH@
     694@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     695@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-color.obj `if test -f '$(MAINSRCDIR)/lib/util/color.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/color.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/color.cc'; fi`
    676696
    677697particles-ini_parser.o: $(MAINSRCDIR)/lib/util/ini_parser.cc
Note: See TracChangeset for help on using the changeset viewer.