Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4291 in orxonox.OLD


Ignore:
Timestamp:
May 26, 2005, 9:21:39 AM (19 years ago)
Author:
bensch
Message:

orxonox/branches/physics: building physics-engine as a lib

Location:
orxonox/branches/physics
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • orxonox/branches/physics/configure

    r4283 r4291  
    79627962## OUTPUT CONFIGURE ##
    79637963######################
    7964                                                                                                                                   ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/gui/Makefile src/lib/gui/console/Makefile src/lib/gui/gui/Makefile src/lib/tinyxml/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/gui/Makefile"
     7964                                                                                                                                            ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/physics/Makefile src/lib/gui/Makefile src/lib/gui/console/Makefile src/lib/gui/gui/Makefile src/lib/tinyxml/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/gui/Makefile"
    79657965
    79667966
     
    85618561  "src/lib/graphics/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/graphics/Makefile" ;;
    85628562  "src/lib/graphics/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/graphics/importer/Makefile" ;;
     8563  "src/lib/physics/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/physics/Makefile" ;;
    85638564  "src/lib/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/Makefile" ;;
    85648565  "src/lib/gui/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/console/Makefile" ;;
  • orxonox/branches/physics/configure.ac

    r4283 r4291  
    519519                 src/lib/graphics/Makefile
    520520                 src/lib/graphics/importer/Makefile
     521                 src/lib/physics/Makefile
    521522                 src/lib/gui/Makefile
    522523                 src/lib/gui/console/Makefile
  • orxonox/branches/physics/src/Makefile.am

    r4290 r4291  
    3737
    3838orxonox_DEPENDENCIES = lib/gui/gui/libORXgui.a \
    39                        lib/tinyxml/libtinyxml.a
     39                       lib/physics/libORXphysics.a \
     40                       lib/tinyxml/libtinyxml.a
     41
    4042orxonox_LDADD = lib/gui/gui/libORXgui.a \
     43                lib/physics/libORXphysics.a \
    4144                lib/tinyxml/libtinyxml.a \
    4245                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
     
    9497                 lib/util/ini_parser.cc \
    9598                 lib/util/substring.cc \
    96                  lib/physics/i_physics.cc \
    97                  lib/physics/physics_engine.cc \
    98                  lib/physics/physics_connection.cc \
    99                  lib/physics/fields/field.cc \
    100                  lib/physics/fields/gravity.cc \
    101                  lib/physics/fields/point_gravity.cc \
    102                  lib/physics/fields/twirl.cc \
    10399                 lib/math/vector.cc \
    104100                 lib/math/curve.cc \
     
    172168                 util/common/list_template.h \
    173169                 util/resource_manager.h \
    174                  lib/physics/i_physics.h \
    175                  lib/physics/physics_engine.h \
    176                  lib/physics/physics_connection.h \
    177                  lib/physics/fields/fields.h \
    178                  lib/physics/fields/field.h \
    179                  lib/physics/fields/gravity.h \
    180                  lib/physics/fields/point_gravity.h \
    181                  lib/physics/fields/twirl.h \
    182170                 util/loading/factory.h \
    183171                 util/loading/load_param.h \
  • orxonox/branches/physics/src/Makefile.in

    r4290 r4291  
    7474        particle_system.$(OBJEXT) particle_emitter.$(OBJEXT) \
    7575        base_entity.$(OBJEXT) base_object.$(OBJEXT) \
    76         ini_parser.$(OBJEXT) substring.$(OBJEXT) i_physics.$(OBJEXT) \
    77         physics_engine.$(OBJEXT) physics_connection.$(OBJEXT) \
    78         field.$(OBJEXT) gravity.$(OBJEXT) point_gravity.$(OBJEXT) \
    79         twirl.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT) \
    80         glmenu_imagescreen.$(OBJEXT) benchmark.$(OBJEXT)
     76        ini_parser.$(OBJEXT) substring.$(OBJEXT) vector.$(OBJEXT) \
     77        curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
     78        benchmark.$(OBJEXT)
    8179orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    8280am__DEPENDENCIES_1 =
     
    9492@AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po ./$(DEPDIR)/curve.Po \
    9593@AMDEP_TRUE@    ./$(DEPDIR)/environment.Po ./$(DEPDIR)/factory.Po \
    96 @AMDEP_TRUE@    ./$(DEPDIR)/field.Po ./$(DEPDIR)/game_loader.Po \
     94@AMDEP_TRUE@    ./$(DEPDIR)/game_loader.Po \
    9795@AMDEP_TRUE@    ./$(DEPDIR)/garbage_collector.Po \
    9896@AMDEP_TRUE@    ./$(DEPDIR)/glmenu_imagescreen.Po \
    9997@AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
    100 @AMDEP_TRUE@    ./$(DEPDIR)/gravity.Po \
    10198@AMDEP_TRUE@    ./$(DEPDIR)/helper_parent.Po \
    102 @AMDEP_TRUE@    ./$(DEPDIR)/i_physics.Po ./$(DEPDIR)/ini_parser.Po \
    103 @AMDEP_TRUE@    ./$(DEPDIR)/keynames.Po ./$(DEPDIR)/light.Po \
    104 @AMDEP_TRUE@    ./$(DEPDIR)/list.Po ./$(DEPDIR)/load_param.Po \
    105 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/md2Model.Po \
    106 @AMDEP_TRUE@    ./$(DEPDIR)/model.Po ./$(DEPDIR)/null_parent.Po \
    107 @AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po \
     99@AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.Po \
     100@AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/list.Po \
     101@AMDEP_TRUE@    ./$(DEPDIR)/load_param.Po ./$(DEPDIR)/material.Po \
     102@AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Po ./$(DEPDIR)/model.Po \
     103@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
    108104@AMDEP_TRUE@    ./$(DEPDIR)/object_manager.Po \
    109105@AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \
     
    111107@AMDEP_TRUE@    ./$(DEPDIR)/particle_engine.Po \
    112108@AMDEP_TRUE@    ./$(DEPDIR)/particle_system.Po \
    113 @AMDEP_TRUE@    ./$(DEPDIR)/physics_connection.Po \
    114 @AMDEP_TRUE@    ./$(DEPDIR)/physics_engine.Po \
    115 @AMDEP_TRUE@    ./$(DEPDIR)/player.Po ./$(DEPDIR)/point_gravity.Po \
     109@AMDEP_TRUE@    ./$(DEPDIR)/player.Po \
    116110@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
    117111@AMDEP_TRUE@    ./$(DEPDIR)/projectile.Po \
     
    125119@AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Po ./$(DEPDIR)/texture.Po \
    126120@AMDEP_TRUE@    ./$(DEPDIR)/track_manager.Po \
    127 @AMDEP_TRUE@    ./$(DEPDIR)/track_node.Po ./$(DEPDIR)/twirl.Po \
    128 @AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/weapon.Po \
    129 @AMDEP_TRUE@    ./$(DEPDIR)/world.Po ./$(DEPDIR)/world_entity.Po
     121@AMDEP_TRUE@    ./$(DEPDIR)/track_node.Po ./$(DEPDIR)/vector.Po \
     122@AMDEP_TRUE@    ./$(DEPDIR)/weapon.Po ./$(DEPDIR)/world.Po \
     123@AMDEP_TRUE@    ./$(DEPDIR)/world_entity.Po
    130124CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    131125        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     
    257251AM_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/physics -I$(MAINSRCDIR)/lib/physics/fields -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
    258252orxonox_DEPENDENCIES = lib/gui/gui/libORXgui.a \
    259                        lib/tinyxml/libtinyxml.a
     253                       lib/physics/libORXphysics.a \
     254                       lib/tinyxml/libtinyxml.a
    260255
    261256orxonox_LDADD = lib/gui/gui/libORXgui.a \
     257                lib/physics/libORXphysics.a \
    262258                lib/tinyxml/libtinyxml.a \
    263259                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
     
    315311                 lib/util/ini_parser.cc \
    316312                 lib/util/substring.cc \
    317                  lib/physics/i_physics.cc \
    318                  lib/physics/physics_engine.cc \
    319                  lib/physics/physics_connection.cc \
    320                  lib/physics/fields/field.cc \
    321                  lib/physics/fields/gravity.cc \
    322                  lib/physics/fields/point_gravity.cc \
    323                  lib/physics/fields/twirl.cc \
    324313                 lib/math/vector.cc \
    325314                 lib/math/curve.cc \
     
    393382                 util/common/list_template.h \
    394383                 util/resource_manager.h \
    395                  lib/physics/i_physics.h \
    396                  lib/physics/physics_engine.h \
    397                  lib/physics/physics_connection.h \
    398                  lib/physics/fields/fields.h \
    399                  lib/physics/fields/field.h \
    400                  lib/physics/fields/gravity.h \
    401                  lib/physics/fields/point_gravity.h \
    402                  lib/physics/fields/twirl.h \
    403384                 util/loading/factory.h \
    404385                 util/loading/load_param.h \
     
    503484@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Po@am__quote@
    504485@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/factory.Po@am__quote@
    505 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/field.Po@am__quote@
    506486@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game_loader.Po@am__quote@
    507487@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/garbage_collector.Po@am__quote@
    508488@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glmenu_imagescreen.Po@am__quote@
    509489@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@
    510 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gravity.Po@am__quote@
    511490@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper_parent.Po@am__quote@
    512 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i_physics.Po@am__quote@
    513491@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@
    514492@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keynames.Po@am__quote@
     
    527505@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_engine.Po@am__quote@
    528506@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_system.Po@am__quote@
    529 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/physics_connection.Po@am__quote@
    530 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/physics_engine.Po@am__quote@
    531507@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@
    532 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/point_gravity.Po@am__quote@
    533508@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@
    534509@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projectile.Po@am__quote@
     
    547522@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_manager.Po@am__quote@
    548523@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_node.Po@am__quote@
    549 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/twirl.Po@am__quote@
    550524@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@
    551525@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weapon.Po@am__quote@
     
    13681342@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    13691343@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o substring.obj `if test -f 'lib/util/substring.cc'; then $(CYGPATH_W) 'lib/util/substring.cc'; else $(CYGPATH_W) '$(srcdir)/lib/util/substring.cc'; fi`
    1370 
    1371 i_physics.o: lib/physics/i_physics.cc
    1372 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT i_physics.o -MD -MP -MF "$(DEPDIR)/i_physics.Tpo" -c -o i_physics.o `test -f 'lib/physics/i_physics.cc' || echo '$(srcdir)/'`lib/physics/i_physics.cc; \
    1373 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/i_physics.Tpo" "$(DEPDIR)/i_physics.Po"; else rm -f "$(DEPDIR)/i_physics.Tpo"; exit 1; fi
    1374 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/physics/i_physics.cc' object='i_physics.o' libtool=no @AMDEPBACKSLASH@
    1375 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/i_physics.Po' tmpdepfile='$(DEPDIR)/i_physics.TPo' @AMDEPBACKSLASH@
    1376 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1377 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o i_physics.o `test -f 'lib/physics/i_physics.cc' || echo '$(srcdir)/'`lib/physics/i_physics.cc
    1378 
    1379 i_physics.obj: lib/physics/i_physics.cc
    1380 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT i_physics.obj -MD -MP -MF "$(DEPDIR)/i_physics.Tpo" -c -o i_physics.obj `if test -f 'lib/physics/i_physics.cc'; then $(CYGPATH_W) 'lib/physics/i_physics.cc'; else $(CYGPATH_W) '$(srcdir)/lib/physics/i_physics.cc'; fi`; \
    1381 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/i_physics.Tpo" "$(DEPDIR)/i_physics.Po"; else rm -f "$(DEPDIR)/i_physics.Tpo"; exit 1; fi
    1382 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/physics/i_physics.cc' object='i_physics.obj' libtool=no @AMDEPBACKSLASH@
    1383 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/i_physics.Po' tmpdepfile='$(DEPDIR)/i_physics.TPo' @AMDEPBACKSLASH@
    1384 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1385 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o i_physics.obj `if test -f 'lib/physics/i_physics.cc'; then $(CYGPATH_W) 'lib/physics/i_physics.cc'; else $(CYGPATH_W) '$(srcdir)/lib/physics/i_physics.cc'; fi`
    1386 
    1387 physics_engine.o: lib/physics/physics_engine.cc
    1388 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physics_engine.o -MD -MP -MF "$(DEPDIR)/physics_engine.Tpo" -c -o physics_engine.o `test -f 'lib/physics/physics_engine.cc' || echo '$(srcdir)/'`lib/physics/physics_engine.cc; \
    1389 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/physics_engine.Tpo" "$(DEPDIR)/physics_engine.Po"; else rm -f "$(DEPDIR)/physics_engine.Tpo"; exit 1; fi
    1390 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/physics/physics_engine.cc' object='physics_engine.o' libtool=no @AMDEPBACKSLASH@
    1391 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/physics_engine.Po' tmpdepfile='$(DEPDIR)/physics_engine.TPo' @AMDEPBACKSLASH@
    1392 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1393 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physics_engine.o `test -f 'lib/physics/physics_engine.cc' || echo '$(srcdir)/'`lib/physics/physics_engine.cc
    1394 
    1395 physics_engine.obj: lib/physics/physics_engine.cc
    1396 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physics_engine.obj -MD -MP -MF "$(DEPDIR)/physics_engine.Tpo" -c -o physics_engine.obj `if test -f 'lib/physics/physics_engine.cc'; then $(CYGPATH_W) 'lib/physics/physics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/physics/physics_engine.cc'; fi`; \
    1397 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/physics_engine.Tpo" "$(DEPDIR)/physics_engine.Po"; else rm -f "$(DEPDIR)/physics_engine.Tpo"; exit 1; fi
    1398 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/physics/physics_engine.cc' object='physics_engine.obj' libtool=no @AMDEPBACKSLASH@
    1399 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/physics_engine.Po' tmpdepfile='$(DEPDIR)/physics_engine.TPo' @AMDEPBACKSLASH@
    1400 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1401 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physics_engine.obj `if test -f 'lib/physics/physics_engine.cc'; then $(CYGPATH_W) 'lib/physics/physics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/physics/physics_engine.cc'; fi`
    1402 
    1403 physics_connection.o: lib/physics/physics_connection.cc
    1404 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physics_connection.o -MD -MP -MF "$(DEPDIR)/physics_connection.Tpo" -c -o physics_connection.o `test -f 'lib/physics/physics_connection.cc' || echo '$(srcdir)/'`lib/physics/physics_connection.cc; \
    1405 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/physics_connection.Tpo" "$(DEPDIR)/physics_connection.Po"; else rm -f "$(DEPDIR)/physics_connection.Tpo"; exit 1; fi
    1406 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/physics/physics_connection.cc' object='physics_connection.o' libtool=no @AMDEPBACKSLASH@
    1407 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/physics_connection.Po' tmpdepfile='$(DEPDIR)/physics_connection.TPo' @AMDEPBACKSLASH@
    1408 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1409 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physics_connection.o `test -f 'lib/physics/physics_connection.cc' || echo '$(srcdir)/'`lib/physics/physics_connection.cc
    1410 
    1411 physics_connection.obj: lib/physics/physics_connection.cc
    1412 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physics_connection.obj -MD -MP -MF "$(DEPDIR)/physics_connection.Tpo" -c -o physics_connection.obj `if test -f 'lib/physics/physics_connection.cc'; then $(CYGPATH_W) 'lib/physics/physics_connection.cc'; else $(CYGPATH_W) '$(srcdir)/lib/physics/physics_connection.cc'; fi`; \
    1413 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/physics_connection.Tpo" "$(DEPDIR)/physics_connection.Po"; else rm -f "$(DEPDIR)/physics_connection.Tpo"; exit 1; fi
    1414 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/physics/physics_connection.cc' object='physics_connection.obj' libtool=no @AMDEPBACKSLASH@
    1415 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/physics_connection.Po' tmpdepfile='$(DEPDIR)/physics_connection.TPo' @AMDEPBACKSLASH@
    1416 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1417 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physics_connection.obj `if test -f 'lib/physics/physics_connection.cc'; then $(CYGPATH_W) 'lib/physics/physics_connection.cc'; else $(CYGPATH_W) '$(srcdir)/lib/physics/physics_connection.cc'; fi`
    1418 
    1419 field.o: lib/physics/fields/field.cc
    1420 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT field.o -MD -MP -MF "$(DEPDIR)/field.Tpo" -c -o field.o `test -f 'lib/physics/fields/field.cc' || echo '$(srcdir)/'`lib/physics/fields/field.cc; \
    1421 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/field.Tpo" "$(DEPDIR)/field.Po"; else rm -f "$(DEPDIR)/field.Tpo"; exit 1; fi
    1422 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/physics/fields/field.cc' object='field.o' libtool=no @AMDEPBACKSLASH@
    1423 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/field.Po' tmpdepfile='$(DEPDIR)/field.TPo' @AMDEPBACKSLASH@
    1424 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1425 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o field.o `test -f 'lib/physics/fields/field.cc' || echo '$(srcdir)/'`lib/physics/fields/field.cc
    1426 
    1427 field.obj: lib/physics/fields/field.cc
    1428 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT field.obj -MD -MP -MF "$(DEPDIR)/field.Tpo" -c -o field.obj `if test -f 'lib/physics/fields/field.cc'; then $(CYGPATH_W) 'lib/physics/fields/field.cc'; else $(CYGPATH_W) '$(srcdir)/lib/physics/fields/field.cc'; fi`; \
    1429 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/field.Tpo" "$(DEPDIR)/field.Po"; else rm -f "$(DEPDIR)/field.Tpo"; exit 1; fi
    1430 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/physics/fields/field.cc' object='field.obj' libtool=no @AMDEPBACKSLASH@
    1431 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/field.Po' tmpdepfile='$(DEPDIR)/field.TPo' @AMDEPBACKSLASH@
    1432 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1433 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o field.obj `if test -f 'lib/physics/fields/field.cc'; then $(CYGPATH_W) 'lib/physics/fields/field.cc'; else $(CYGPATH_W) '$(srcdir)/lib/physics/fields/field.cc'; fi`
    1434 
    1435 gravity.o: lib/physics/fields/gravity.cc
    1436 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gravity.o -MD -MP -MF "$(DEPDIR)/gravity.Tpo" -c -o gravity.o `test -f 'lib/physics/fields/gravity.cc' || echo '$(srcdir)/'`lib/physics/fields/gravity.cc; \
    1437 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/gravity.Tpo" "$(DEPDIR)/gravity.Po"; else rm -f "$(DEPDIR)/gravity.Tpo"; exit 1; fi
    1438 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/physics/fields/gravity.cc' object='gravity.o' libtool=no @AMDEPBACKSLASH@
    1439 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/gravity.Po' tmpdepfile='$(DEPDIR)/gravity.TPo' @AMDEPBACKSLASH@
    1440 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1441 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gravity.o `test -f 'lib/physics/fields/gravity.cc' || echo '$(srcdir)/'`lib/physics/fields/gravity.cc
    1442 
    1443 gravity.obj: lib/physics/fields/gravity.cc
    1444 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gravity.obj -MD -MP -MF "$(DEPDIR)/gravity.Tpo" -c -o gravity.obj `if test -f 'lib/physics/fields/gravity.cc'; then $(CYGPATH_W) 'lib/physics/fields/gravity.cc'; else $(CYGPATH_W) '$(srcdir)/lib/physics/fields/gravity.cc'; fi`; \
    1445 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/gravity.Tpo" "$(DEPDIR)/gravity.Po"; else rm -f "$(DEPDIR)/gravity.Tpo"; exit 1; fi
    1446 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/physics/fields/gravity.cc' object='gravity.obj' libtool=no @AMDEPBACKSLASH@
    1447 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/gravity.Po' tmpdepfile='$(DEPDIR)/gravity.TPo' @AMDEPBACKSLASH@
    1448 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1449 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gravity.obj `if test -f 'lib/physics/fields/gravity.cc'; then $(CYGPATH_W) 'lib/physics/fields/gravity.cc'; else $(CYGPATH_W) '$(srcdir)/lib/physics/fields/gravity.cc'; fi`
    1450 
    1451 point_gravity.o: lib/physics/fields/point_gravity.cc
    1452 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT point_gravity.o -MD -MP -MF "$(DEPDIR)/point_gravity.Tpo" -c -o point_gravity.o `test -f 'lib/physics/fields/point_gravity.cc' || echo '$(srcdir)/'`lib/physics/fields/point_gravity.cc; \
    1453 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/point_gravity.Tpo" "$(DEPDIR)/point_gravity.Po"; else rm -f "$(DEPDIR)/point_gravity.Tpo"; exit 1; fi
    1454 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/physics/fields/point_gravity.cc' object='point_gravity.o' libtool=no @AMDEPBACKSLASH@
    1455 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/point_gravity.Po' tmpdepfile='$(DEPDIR)/point_gravity.TPo' @AMDEPBACKSLASH@
    1456 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1457 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o point_gravity.o `test -f 'lib/physics/fields/point_gravity.cc' || echo '$(srcdir)/'`lib/physics/fields/point_gravity.cc
    1458 
    1459 point_gravity.obj: lib/physics/fields/point_gravity.cc
    1460 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT point_gravity.obj -MD -MP -MF "$(DEPDIR)/point_gravity.Tpo" -c -o point_gravity.obj `if test -f 'lib/physics/fields/point_gravity.cc'; then $(CYGPATH_W) 'lib/physics/fields/point_gravity.cc'; else $(CYGPATH_W) '$(srcdir)/lib/physics/fields/point_gravity.cc'; fi`; \
    1461 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/point_gravity.Tpo" "$(DEPDIR)/point_gravity.Po"; else rm -f "$(DEPDIR)/point_gravity.Tpo"; exit 1; fi
    1462 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/physics/fields/point_gravity.cc' object='point_gravity.obj' libtool=no @AMDEPBACKSLASH@
    1463 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/point_gravity.Po' tmpdepfile='$(DEPDIR)/point_gravity.TPo' @AMDEPBACKSLASH@
    1464 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1465 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o point_gravity.obj `if test -f 'lib/physics/fields/point_gravity.cc'; then $(CYGPATH_W) 'lib/physics/fields/point_gravity.cc'; else $(CYGPATH_W) '$(srcdir)/lib/physics/fields/point_gravity.cc'; fi`
    1466 
    1467 twirl.o: lib/physics/fields/twirl.cc
    1468 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT twirl.o -MD -MP -MF "$(DEPDIR)/twirl.Tpo" -c -o twirl.o `test -f 'lib/physics/fields/twirl.cc' || echo '$(srcdir)/'`lib/physics/fields/twirl.cc; \
    1469 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/twirl.Tpo" "$(DEPDIR)/twirl.Po"; else rm -f "$(DEPDIR)/twirl.Tpo"; exit 1; fi
    1470 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/physics/fields/twirl.cc' object='twirl.o' libtool=no @AMDEPBACKSLASH@
    1471 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/twirl.Po' tmpdepfile='$(DEPDIR)/twirl.TPo' @AMDEPBACKSLASH@
    1472 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1473 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o twirl.o `test -f 'lib/physics/fields/twirl.cc' || echo '$(srcdir)/'`lib/physics/fields/twirl.cc
    1474 
    1475 twirl.obj: lib/physics/fields/twirl.cc
    1476 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT twirl.obj -MD -MP -MF "$(DEPDIR)/twirl.Tpo" -c -o twirl.obj `if test -f 'lib/physics/fields/twirl.cc'; then $(CYGPATH_W) 'lib/physics/fields/twirl.cc'; else $(CYGPATH_W) '$(srcdir)/lib/physics/fields/twirl.cc'; fi`; \
    1477 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/twirl.Tpo" "$(DEPDIR)/twirl.Po"; else rm -f "$(DEPDIR)/twirl.Tpo"; exit 1; fi
    1478 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/physics/fields/twirl.cc' object='twirl.obj' libtool=no @AMDEPBACKSLASH@
    1479 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/twirl.Po' tmpdepfile='$(DEPDIR)/twirl.TPo' @AMDEPBACKSLASH@
    1480 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1481 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o twirl.obj `if test -f 'lib/physics/fields/twirl.cc'; then $(CYGPATH_W) 'lib/physics/fields/twirl.cc'; else $(CYGPATH_W) '$(srcdir)/lib/physics/fields/twirl.cc'; fi`
    14821344
    14831345vector.o: lib/math/vector.cc
     
    16671529
    16681530distdir: $(DISTFILES)
    1669         $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/graphics/particles $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/physics $(distdir)/lib/physics/fields $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
     1531        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/graphics/particles $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
    16701532        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    16711533        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • orxonox/branches/physics/src/lib/Makefile.am

    r4283 r4291  
    33
    44SUBDIRS = graphics \
     5          physics \
    56          tinyxml \
    67          $(GTK_PROGS)
  • orxonox/branches/physics/src/lib/Makefile.in

    r4283 r4291  
    168168GTK_PROGS = gui
    169169SUBDIRS = graphics \
     170          physics \
    170171          tinyxml \
    171172          $(GTK_PROGS)
  • orxonox/branches/physics/src/lib/physics/Makefile.am

    r4289 r4291  
    1 noinst_LIBRARIES = libtinyxml.a
     1MAINSRCDIR=../..
     2AM_CXXFLAGS=-I$(MAINSRCDIR)
     3AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities
     4AM_CXXFLAGS+=-I$(MAINSRCDIR)/story_entities
     5AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib
     6AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/coord
     7AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
     8AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
     9AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
     10AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/particles
     11AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
     12AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gui
     13AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
     14AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
     15AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
     16AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics
     17AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics/fields
     18AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/tinyxml
     19AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
     20AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
     21AM_CXXFLAGS+=-I$(MAINSRCDIR)/network
     22AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu
     23AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
     24AM_CXXFLAGS+=-I$(MAINSRCDIR)/util
     25AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
     26AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
     27AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/loading
     28AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/track
     29AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects
    230
    3 libtinyxml_a_SOURCES = tinyxml.cc \
    4                        tinystr.cc \
    5                        tinyxmlerror.cc \
    6                        tinyxmlparser.cc
    731
    8 noinst_HEADERS= tinyxml.h \
    9                 tinystr.h
     32noinst_LIBRARIES = libORXphysics.a
     33
     34libORXphysics_a_SOURCES = i_physics.cc \
     35                          physics_connection.cc \
     36                          physics_engine.cc \
     37                          fields/field.cc \
     38                          fields/gravity.cc \
     39                          fields/point_gravity.cc \
     40                          fields/twirl.cc
     41
     42noinst_HEADERS= i_physics.h \
     43                physics_connection.h \
     44                physics_engine.h \
     45                fields/field.h \
     46                fields/gravity.h \
     47                fields/point_gravity.h \
     48                fields/twirl.h
Note: See TracChangeset for help on using the changeset viewer.