Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3474 in orxonox.OLD for orxonox/trunk/src/Makefile.in


Ignore:
Timestamp:
Mar 10, 2005, 6:39:18 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: redesigning directory structure - created lib and added all importand classes, did exclude collision.* since i couldnt integrate it into the new pnode model (have to do this with fuzzy)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.in

    r3473 r3474  
    5454PROGRAMS = $(bin_PROGRAMS)
    5555am_orxonox_OBJECTS = orxonox.$(OBJEXT) world.$(OBJEXT) \
    56         player.$(OBJEXT) collision.$(OBJEXT) data_tank.$(OBJEXT) \
    57         world_entity.$(OBJEXT) vector.$(OBJEXT) camera.$(OBJEXT) \
    58         command_node.$(OBJEXT) ini_parser.$(OBJEXT) keynames.$(OBJEXT) \
    59         base_entity.$(OBJEXT) game_loader.$(OBJEXT) campaign.$(OBJEXT) \
     56        player.$(OBJEXT) data_tank.$(OBJEXT) world_entity.$(OBJEXT) \
     57        vector.$(OBJEXT) camera.$(OBJEXT) command_node.$(OBJEXT) \
     58        ini_parser.$(OBJEXT) keynames.$(OBJEXT) base_entity.$(OBJEXT) \
     59        game_loader.$(OBJEXT) campaign.$(OBJEXT) \
    6060        story_entity.$(OBJEXT) environment.$(OBJEXT) model.$(OBJEXT) \
    6161        objModel.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT) \
    … …  
    7373@AMDEP_TRUE@    ./$(DEPDIR)/base_entity.Po \
    7474@AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po ./$(DEPDIR)/camera.Po \
    75 @AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po ./$(DEPDIR)/collision.Po \
     75@AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po \
    7676@AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po ./$(DEPDIR)/curve.Po \
    7777@AMDEP_TRUE@    ./$(DEPDIR)/data_tank.Po \
    … …  
    214214target_os = @target_os@
    215215target_vendor = @target_vendor@
    216 AM_CXXFLAGS = "-I./world_entities" "-I./story_entities" "-I./mathlib"
     216AM_CXXFLAGS = "-I./world_entities" "-I./story_entities" "-I./mathlib" "-I./lib"
    217217AM_LDFLAGS = $(MWINDOWS)
    218218orxonox_SOURCES = orxonox.cc \
    219219                 world.cc \
    220220                 world_entities/player.cc \
    221                  collision.cc \
    222221                 data_tank.cc \
    223222                 world_entities/world_entity.cc \
    … …  
    225224                 camera.cc \
    226225                 command_node.cc \
    227                  ini_parser.cc \
     226                 lib/ini_parser.cc \
    228227                 keynames.cc \
    229228                 base_entity.cc \
    … …  
    237236                 importer/material.cc \
    238237                 importer/texture.cc \
    239                  list.cc \
     238                 lib/list.cc \
    240239                 p_node.cc \
    241240                 null_parent.cc \
    … …  
    252251noinst_HEADERS = ability.h \
    253252                 data_tank.h \
    254                  collision.h \
    255253                 world_entities/npc.h \
    256254                 stdincl.h \
    … …  
    264262                 world_entities/player.h \
    265263                 camera.h \
    266                  ini_parser.h \
     264                 lib/ini_parser.h \
    267265                 power_up.h \
    268266                 mathlib/vector.h \
    … …  
    271269                 world.h \
    272270                 command_node.h \
    273                  list.h \
     271                 lib/list.h \
    274272                 shoot_laser.h \
    275273                 world_entities/world_entity.h \
    276274                 message_structures.h \
    277275                 shoot_rocket.h \
    278                  list_template.h \
     276                 lib/list_template.h \
    279277                 story_entities/story_entity.h \
    280278                 story_entities/story_def.h \
    … …  
    378376@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camera.Po@am__quote@
    379377@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/campaign.Po@am__quote@
    380 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision.Po@am__quote@
    381378@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command_node.Po@am__quote@
    382379@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve.Po@am__quote@
    … …  
    471468@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.obj `if test -f 'mathlib/vector.cc'; then $(CYGPATH_W) 'mathlib/vector.cc'; else $(CYGPATH_W) '$(srcdir)/mathlib/vector.cc'; fi`
    472469
     470ini_parser.o: lib/ini_parser.cc
     471@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ini_parser.o -MD -MP -MF "$(DEPDIR)/ini_parser.Tpo" -c -o ini_parser.o `test -f 'lib/ini_parser.cc' || echo '$(srcdir)/'`lib/ini_parser.cc; \
     472@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/ini_parser.Tpo" "$(DEPDIR)/ini_parser.Po"; else rm -f "$(DEPDIR)/ini_parser.Tpo"; exit 1; fi
     473@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/ini_parser.cc' object='ini_parser.o' libtool=no @AMDEPBACKSLASH@
     474@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/ini_parser.Po' tmpdepfile='$(DEPDIR)/ini_parser.TPo' @AMDEPBACKSLASH@
     475@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     476@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ini_parser.o `test -f 'lib/ini_parser.cc' || echo '$(srcdir)/'`lib/ini_parser.cc
     477
     478ini_parser.obj: lib/ini_parser.cc
     479@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ini_parser.obj -MD -MP -MF "$(DEPDIR)/ini_parser.Tpo" -c -o ini_parser.obj `if test -f 'lib/ini_parser.cc'; then $(CYGPATH_W) 'lib/ini_parser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/ini_parser.cc'; fi`; \
     480@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/ini_parser.Tpo" "$(DEPDIR)/ini_parser.Po"; else rm -f "$(DEPDIR)/ini_parser.Tpo"; exit 1; fi
     481@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/ini_parser.cc' object='ini_parser.obj' libtool=no @AMDEPBACKSLASH@
     482@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/ini_parser.Po' tmpdepfile='$(DEPDIR)/ini_parser.TPo' @AMDEPBACKSLASH@
     483@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     484@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ini_parser.obj `if test -f 'lib/ini_parser.cc'; then $(CYGPATH_W) 'lib/ini_parser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/ini_parser.cc'; fi`
     485
    473486campaign.o: story_entities/campaign.cc
    474487@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT campaign.o -MD -MP -MF "$(DEPDIR)/campaign.Tpo" -c -o campaign.o `test -f 'story_entities/campaign.cc' || echo '$(srcdir)/'`story_entities/campaign.cc; \
    … …  
    598611@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    599612@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o texture.obj `if test -f 'importer/texture.cc'; then $(CYGPATH_W) 'importer/texture.cc'; else $(CYGPATH_W) '$(srcdir)/importer/texture.cc'; fi`
     613
     614list.o: lib/list.cc
     615@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT list.o -MD -MP -MF "$(DEPDIR)/list.Tpo" -c -o list.o `test -f 'lib/list.cc' || echo '$(srcdir)/'`lib/list.cc; \
     616@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/list.Tpo" "$(DEPDIR)/list.Po"; else rm -f "$(DEPDIR)/list.Tpo"; exit 1; fi
     617@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/list.cc' object='list.o' libtool=no @AMDEPBACKSLASH@
     618@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/list.Po' tmpdepfile='$(DEPDIR)/list.TPo' @AMDEPBACKSLASH@
     619@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     620@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o list.o `test -f 'lib/list.cc' || echo '$(srcdir)/'`lib/list.cc
     621
     622list.obj: lib/list.cc
     623@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT list.obj -MD -MP -MF "$(DEPDIR)/list.Tpo" -c -o list.obj `if test -f 'lib/list.cc'; then $(CYGPATH_W) 'lib/list.cc'; else $(CYGPATH_W) '$(srcdir)/lib/list.cc'; fi`; \
     624@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/list.Tpo" "$(DEPDIR)/list.Po"; else rm -f "$(DEPDIR)/list.Tpo"; exit 1; fi
     625@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/list.cc' object='list.obj' libtool=no @AMDEPBACKSLASH@
     626@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/list.Po' tmpdepfile='$(DEPDIR)/list.TPo' @AMDEPBACKSLASH@
     627@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     628@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o list.obj `if test -f 'lib/list.cc'; then $(CYGPATH_W) 'lib/list.cc'; else $(CYGPATH_W) '$(srcdir)/lib/list.cc'; fi`
    600629
    601630matrix.o: mathlib/matrix.cc
    … …  
    769798
    770799distdir: $(DISTFILES)
    771         $(mkdir_p) $(distdir)/mathlib $(distdir)/sfont $(distdir)/story_entities $(distdir)/world_entities
     800        $(mkdir_p) $(distdir)/lib $(distdir)/mathlib $(distdir)/sfont $(distdir)/story_entities $(distdir)/world_entities
    772801        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    773802        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
Note: See TracChangeset for help on using the changeset viewer.