Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
May 27, 2005, 9:16:53 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged branches/physics back to the trunk
merged with command
svn merge -r 3866:HEAD . ../../trunk/
many conflict that i tried to resolv
@patrick: i hope i did not interfere with your stuff :/

File:
1 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.in

    r4326 r4338  
    6060        garbage_collector.$(OBJEXT) list.$(OBJEXT) \
    6161        resource_manager.$(OBJEXT) factory.$(OBJEXT) \
    62         load_param.$(OBJEXT) story_entity.$(OBJEXT) campaign.$(OBJEXT) \
    63         world.$(OBJEXT) world_entity.$(OBJEXT) camera.$(OBJEXT) \
    64         player.$(OBJEXT) environment.$(OBJEXT) skysphere.$(OBJEXT) \
    65         skybox.$(OBJEXT) terrain.$(OBJEXT) weapon.$(OBJEXT) \
    66         projectile.$(OBJEXT) satellite.$(OBJEXT) \
     62        load_param.$(OBJEXT) state.$(OBJEXT) story_entity.$(OBJEXT) \
     63        campaign.$(OBJEXT) world.$(OBJEXT) world_entity.$(OBJEXT) \
     64        camera.$(OBJEXT) player.$(OBJEXT) environment.$(OBJEXT) \
     65        skysphere.$(OBJEXT) skybox.$(OBJEXT) terrain.$(OBJEXT) \
     66        weapon.$(OBJEXT) projectile.$(OBJEXT) satellite.$(OBJEXT) \
    6767        character_attributes.$(OBJEXT) test_gun.$(OBJEXT) \
    6868        test_bullet.$(OBJEXT) test_entity.$(OBJEXT) p_node.$(OBJEXT) \
    … …  
    110110@AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
    111111@AMDEP_TRUE@    ./$(DEPDIR)/satellite.Po ./$(DEPDIR)/skybox.Po \
    112 @AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po \
     112@AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po ./$(DEPDIR)/state.Po \
    113113@AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po \
    114114@AMDEP_TRUE@    ./$(DEPDIR)/substring.Po ./$(DEPDIR)/terrain.Po \
    … …  
    247247target_vendor = @target_vendor@
    248248MAINSRCDIR = .
    249 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/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/tinyxml -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/util/track -I$(MAINSRCDIR)/subprojects
     249AM_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/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/tinyxml -I$(MAINSRCDIR)/lib/physics -I$(MAINSRCDIR)/lib/physics/fields -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/util/track -I$(MAINSRCDIR)/subprojects
    250250orxonox_DEPENDENCIES = lib/gui/gui/libORXgui.a \
    251                        lib/tinyxml/libtinyxml.a
     251                       lib/physics/libORXphysics.a \
     252                       lib/tinyxml/libtinyxml.a
    252253
    253254orxonox_LDADD = lib/gui/gui/libORXgui.a \
     255                lib/physics/libORXphysics.a \
    254256                lib/tinyxml/libtinyxml.a \
    255257                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    … …  
    270272                 util/loading/factory.cc \
    271273                 util/loading/load_param.cc \
     274                 util/state.cc \
    272275                 story_entities/story_entity.cc \
    273276                 story_entities/campaign.cc \
    … …  
    327330                 util/object_manager.h \
    328331                 util/garbage_collector.h \
     332                 util/state.h \
    329333                 story_entities/story_entity.h \
    330334                 story_entities/story_def.h \
    … …  
    509513@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skybox.Po@am__quote@
    510514@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skysphere.Po@am__quote@
     515@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/state.Po@am__quote@
    511516@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@
    512517@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/substring.Po@am__quote@
    … …  
    747752@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    748753@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o load_param.obj `if test -f 'util/loading/load_param.cc'; then $(CYGPATH_W) 'util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/util/loading/load_param.cc'; fi`
     754
     755state.o: util/state.cc
     756@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT state.o -MD -MP -MF "$(DEPDIR)/state.Tpo" -c -o state.o `test -f 'util/state.cc' || echo '$(srcdir)/'`util/state.cc; \
     757@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/state.Tpo" "$(DEPDIR)/state.Po"; else rm -f "$(DEPDIR)/state.Tpo"; exit 1; fi
     758@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/state.cc' object='state.o' libtool=no @AMDEPBACKSLASH@
     759@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/state.Po' tmpdepfile='$(DEPDIR)/state.TPo' @AMDEPBACKSLASH@
     760@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     761@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o state.o `test -f 'util/state.cc' || echo '$(srcdir)/'`util/state.cc
     762
     763state.obj: util/state.cc
     764@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT state.obj -MD -MP -MF "$(DEPDIR)/state.Tpo" -c -o state.obj `if test -f 'util/state.cc'; then $(CYGPATH_W) 'util/state.cc'; else $(CYGPATH_W) '$(srcdir)/util/state.cc'; fi`; \
     765@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/state.Tpo" "$(DEPDIR)/state.Po"; else rm -f "$(DEPDIR)/state.Tpo"; exit 1; fi
     766@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/state.cc' object='state.obj' libtool=no @AMDEPBACKSLASH@
     767@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/state.Po' tmpdepfile='$(DEPDIR)/state.TPo' @AMDEPBACKSLASH@
     768@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     769@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o state.obj `if test -f 'util/state.cc'; then $(CYGPATH_W) 'util/state.cc'; else $(CYGPATH_W) '$(srcdir)/util/state.cc'; fi`
    749770
    750771story_entity.o: story_entities/story_entity.cc
Note: See TracChangeset for help on using the changeset viewer.