Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 2, 2008, 1:34:58 PM (16 years ago)
Author:
rgrieder
Message:

Merged physics branch into physics_new branch.

Location:
code/branches/physics_new
Files:
32 edited
450 copied

Legend:

Unmodified
Added
Removed

  • code/branches/physics_new

  • code/branches/physics_new/CMakeLists.txt

    r1889 r2119  
    9797FIND_PACKAGE(TCL)
    9898FIND_PACKAGE(DirectX)
     99FIND_PACKAGE(ODE)
    99100
    100101# Set the search paths for the linking
    … …  
    108109  ${Zlib_LIBRARY_DIR}
    109110  ${TCL_LIBRARY}
     111  ${ODE_LIB_DIR}
    110112)
    111113
    … …  
    125127  ${DirectX_INCLUDE_DIR}
    126128  ${ZLIB_INCLUDE_DIR}
     129  ${ODE_INCLUDE_DIR}
    127130)
    128131

  • code/branches/physics_new/cmake/FindODE.cmake

    r1505 r2119  
    1 # find ODE (Open Dynamics Engine) includes and library
     1# Find ODE includes and library
    22#
    3 # ODE_INCLUDE_DIR - where the directory containing the ODE headers can be
    4 #                   found
    5 # ODE_LIBRARY     - full path to the ODE library
    6 # ODE_FOUND       - TRUE if ODE was found
     3# This module defines
     4#  ODE_INCLUDE_DIR
     5#  ODE_LIBRARIES, the libraries to link against to use ODE.
     6#  ODE_LIB_DIR, the location of the libraries
     7#  ODE_FOUND, If false, do not try to use ODE
     8#
     9# Copyright © 2007, Matt Williams (version for FindOGRE)
     10# Modified by Nicolas Schlumberger to make it work on the Tardis-Infrastucture of the ETH Zurich
     11#
     12# Redistribution and use is allowed according to the terms of the BSD license.
     13#
     14# Several changes and additions by Fabian 'x3n' Landau
     15# Adaption from FindOGRE to FindODE by Reto '1337' Grieder
     16#                 > www.orxonox.net <
    717
    8 IF (NOT ODE_FOUND)
     18IF (ODE_LIBRARIES AND ODE_INCLUDE_DIR AND ODE_LIB_DIR)
     19    SET (ODE_FIND_QUIETLY TRUE) # Already in cache, be silent
     20ENDIF (ODE_LIBRARIES AND ODE_INCLUDE_DIR AND ODE_LIB_DIR)
    921
    10   FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
    11     /usr/include
    12     /usr/local/include
    13     $ENV{OGRE_HOME}/include # OGRE SDK on WIN32
    14     $ENV{INCLUDE}
    15   )
    16   FIND_LIBRARY(ODE_LIBRARY
    17     NAMES ode
    18     PATHS
    19     /usr/lib
    20     /usr/local/lib
    21     $ENV{OGRE_HOME}/lib # OGRE SDK on WIN32
    22   )
     22IF (WIN32) #Windows
     23    FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
     24        ../libs/ode-0.10.1/include
     25        ${DEPENDENCY_DIR}/ode-0.10.1/include
     26    )
    2327
    24   IF(ODE_INCLUDE_DIR)
    25     MESSAGE(STATUS "Found ODE include dir: ${ODE_INCLUDE_DIR}")
    26   ELSE(ODE_INCLUDE_DIR)
    27     MESSAGE(STATUS "Could NOT find ODE headers.")
    28   ENDIF(ODE_INCLUDE_DIR)
     28    SET(ODE_LIBRARIES debug ode_singled optimized ode_single)
     29    FIND_LIBRARY(ODE_LIBDIR NAMES ${ODE_LIBRARIES} PATHS
     30        ../libs/ode-0.10.1/lib
     31        ${DEPENDENCY_DIR}/ode-0.10.1/lib
     32    )
    2933
    30   IF(ODE_LIBRARY)
    31     MESSAGE(STATUS "Found ODE library: ${ODE_LIBRARY}")
    32   ELSE(ODE_LIBRARY)
    33     MESSAGE(STATUS "Could NOT find ODE library.")
    34   ENDIF(ODE_LIBRARY)
     34    # Strip the filename from the path
     35    IF (ODE_LIBDIR)
     36        GET_FILENAME_COMPONENT(ODE_LIBDIR ${ODE_LIBDIR} PATH)
     37        SET (ODE_LIB_DIR ${ODE_LIBDIR} CACHE FILEPATH "")
     38    ENDIF (ODE_LIBDIR)
     39ELSE (WIN32) #Unix
     40    FIND_PACKAGE(PkgConfig)
     41    PKG_SEARCH_MODULE(ODE ODE /usr/pack/ode-0.9-sd/i686-debian-linux3.1/lib/pkgconfig/ode.pc) # tardis specific hack
     42    SET(ODE_INCLUDE_DIR ${ODE_INCLUDE_DIRS})
     43    SET(ODE_LIB_DIR ${ODE_LIBDIR})
     44    SET(ODE_LIBRARIES ${ODE_LIBRARIES})
     45ENDIF (WIN32)
    3546
    36   IF(ODE_INCLUDE_DIR AND ODE_LIBRARY)
    37      SET(ODE_FOUND TRUE CACHE STRING "Whether ODE was found or not")
    38    ELSE(ODE_INCLUDE_DIR AND ODE_LIBRARY)
    39      SET(ODE_FOUND FALSE)
    40      IF(ODE_FIND_REQUIRED)
    41        MESSAGE(FATAL_ERROR "Could not find ODE. Please install ODE (http://www.ode.org)")
    42      ENDIF(ODE_FIND_REQUIRED)
    43    ENDIF(ODE_INCLUDE_DIR AND ODE_LIBRARY)
    44 ENDIF (NOT ODE_FOUND)
     47#Do some preparation
     48SEPARATE_ARGUMENTS(ODE_INCLUDE_DIR)
     49SEPARATE_ARGUMENTS(ODE_LIBRARIES)
    4550
    46 # vim: et sw=4 ts=4
     51SET (ODE_INCLUDE_DIR ${ODE_INCLUDE_DIR} CACHE PATH "")
     52SET (ODE_LIBRARIES ${ODE_LIBRARIES} CACHE STRING "")
     53SET (ODE_LIB_DIR ${ODE_LIB_DIR} CACHE PATH "")
     54
     55IF (ODE_INCLUDE_DIR AND ODE_LIBRARIES AND ODE_LIB_DIR)
     56    SET(ODE_FOUND TRUE)
     57ENDIF (ODE_INCLUDE_DIR AND ODE_LIBRARIES AND ODE_LIB_DIR)
     58
     59IF (ODE_FOUND)
     60    IF (NOT ODE_FIND_QUIETLY)
     61        MESSAGE(STATUS "ODE was found.")
     62        IF (VERBOSE_FIND)
     63            MESSAGE (STATUS "  include path: ${ODE_INCLUDE_DIR}")
     64            MESSAGE (STATUS "  library path: ${ODE_LIB_DIR}")
     65            MESSAGE (STATUS "  libraries:    ${ODE_LIBRARIES}")
     66        ENDIF (VERBOSE_FIND)
     67    ENDIF (NOT ODE_FIND_QUIETLY)
     68ELSE (ODE_FOUND)
     69    IF (NOT ODE_INCLUDE_DIR)
     70        MESSAGE(SEND_ERROR "ODE include path was not found.")
     71    ENDIF (NOT ODE_INCLUDE_DIR)
     72    IF (NOT ODE_LIB_DIR)
     73        MESSAGE(SEND_ERROR "ODE library was not found.")
     74    ENDIF (NOT ODE_LIB_DIR)
     75    IF (NOT ODE_LIBRARIES)
     76        MESSAGE(SEND_ERROR "ODE libraries not known.")
     77    ENDIF (NOT ODE_LIBRARIES)
     78ENDIF (ODE_FOUND)

  • code/branches/physics_new/src/CMakeLists.txt

    r1854 r2119  
    22INCLUDE_DIRECTORIES(..)
    33INCLUDE_DIRECTORIES(orxonox)
     4INCLUDE_DIRECTORIES(bullet)
     5INCLUDE_DIRECTORIES(ogrebullet/Dynamics)
     6INCLUDE_DIRECTORIES(ogrebullet/Collisions)
    47
    58ADD_SUBDIRECTORY(cpptcl)
    69ADD_SUBDIRECTORY(ois)
    710ADD_SUBDIRECTORY(tinyxml)
     11ADD_SUBDIRECTORY(bullet)
     12ADD_SUBDIRECTORY(ogrebullet)
     13# ADD_SUBDIRECTORY(ogreode)
    814ADD_SUBDIRECTORY(lua)
    915ADD_SUBDIRECTORY(tolua)

  • code/branches/physics_new/src/bullet/BulletCollision/GIMPACT

  • code/branches/physics_new/src/core/XMLIncludes.h

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/src/orxonox/CMakeLists.txt

    r2106 r2119  
    4646  objects/EventDispatcher.cc
    4747  objects/EventTarget.cc
     48#  objects/PhysicsTest.cc
     49  objects/HelloBullet.cc
    4850  objects/Radar.cc
    4951  objects/RadarListener.cc
    … …  
    144146  tinyxml_orxonox
    145147  tolualib_orxonox
     148  LibLinearMath
     149  LibBulletCollision
     150  LibBulletDynamics
     151  LibBulletSoftBody
     152  ogrebullet_collisions_orxonox
     153  ogrebullet_dynamics_orxonox
    146154  util
    147155  core

  • code/branches/physics_new/src/orxonox/gamestates/GSLevel.cc

    r2103 r2119  
    5151namespace orxonox
    5252{
    53     SetCommandLineArgument(level, "sample2.oxw").shortcut("l");
     53    SetCommandLineArgument(level, "physicstest2.oxw").shortcut("l");
    5454
    5555    GSLevel::GSLevel()

  • code/branches/physics_new/src/orxonox/objects/weaponSystem/WeaponSystem.h

  • code/branches/physics_new/src/tolua/tolua-5.1.pkg

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/src/util

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/src/util/Exception.cc

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/src/util/Exception.h

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/audio.vsprops

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/base.vsprops

    r2103 r2119  
    88        <Tool
    99                Name="VCCLCompilerTool"
    10                 AdditionalIncludeDirectories="&quot;$(RootDir)&quot;;&quot;$(RootDir)src&quot;;&quot;$(RootDir)src\orxonox&quot;;&quot;$(RootDir)src\ceguilua-0.6.1&quot;;&quot;$(LibDir)ogre-1.4.9\include&quot;;&quot;$(LibDir)boost-1.35.0\include&quot;;&quot;$(LibDir)cegui-0.6.1\include&quot;;&quot;$(LibDir)enet-1.2\include&quot;;&quot;$(LibDir)libogg-1.1.3\include&quot;;&quot;$(LibDir)libvorbis-1.2.0\include&quot;;&quot;$(LibDir)openal-1.1\include&quot;;&quot;$(LibDir)freealut-1.1.0\include&quot;;&quot;$(LibDir)tcl-8.5.2\include&quot;;&quot;$(LibDir)zlib-1.2.3\include&quot;"
     10                AdditionalIncludeDirectories="&quot;$(RootDir)src&quot;;&quot;$(RootDir)src\ceguilua-0.6.1&quot;;&quot;$(LibDir)ogre-1.4.9\include&quot;;&quot;$(LibDir)boost-1.35.0\include&quot;;&quot;$(LibDir)cegui-0.6.1\include&quot;;&quot;$(LibDir)enet-1.2\include&quot;;&quot;$(LibDir)libogg-1.1.3\include&quot;;&quot;$(LibDir)libvorbis-1.2.0\include&quot;;&quot;$(LibDir)openal-1.1\include&quot;;&quot;$(LibDir)freealut-1.1.0\include&quot;;&quot;$(LibDir)tcl-8.5.2\include&quot;;&quot;$(LibDir)zlib-1.2.3\include&quot;;&quot;$(LibDir)ode-0.10.1\include&quot;"
    1111                PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;_WINDOWS;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB;ZLIB_WINAPI"
    1212                WarningLevel="3"
    … …  
    2121                Name="VCLinkerTool"
    2222                OutputFile="$(OutDir)$(ProjectName)$(CS).dll"
    23                 AdditionalLibraryDirectories="&quot;$(LibDir)boost-1.35.0\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)cegui-0.6.1\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)enet-1.2\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)freealut-1.1.0\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)libogg-1.1.3\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)libvorbis-1.2.0\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)ogre-1.4.9\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)openal-1.1\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)tcl-8.5.2\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)zlib-1.2.3\lib\$(ConfigurationName)&quot;"
     23                AdditionalLibraryDirectories="&quot;$(LibDir)boost-1.35.0\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)cegui-0.6.1\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)enet-1.2\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)freealut-1.1.0\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)libogg-1.1.3\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)libvorbis-1.2.0\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)ode-0.10.1\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)ogre-1.4.9\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)openal-1.1\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)tcl-8.5.2\lib\$(ConfigurationName)&quot;;&quot;$(LibDir)zlib-1.2.3\lib\$(ConfigurationName)&quot;"
    2424                SubSystem="1"
    2525                ImportLibrary="$(IntDir)\$(TargetName).lib"

  • code/branches/physics_new/visual_studio/vc8/ceguilua.vsprops

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/core.vsprops

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/cpptcl.vsprops

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/debug.vsprops

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/directories.vsprops

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/lua.vsprops

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/network.vsprops

  • code/branches/physics_new/visual_studio/vc8/orxonox.vsprops

    r2103 r2119  
    99                Name="VCCLCompilerTool"
    1010                AdditionalOptions="/MP2 /Zm200"
     11                AdditionalIncludeDirectories="$(RootDir)src\orxonox"
    1112                PreprocessorDefinitions="ORXONOX_NO_EXPORTS;ORXONOX_ENABLE_PCH;LUA_BUILD_AS_DLL"
    1213                UsePrecompiledHeader="2"

  • code/branches/physics_new/visual_studio/vc8/orxonox_vc8.sln

    r2103 r2119  
    88        EndProjectSection
    99        ProjectSection(ProjectDependencies) = postProject
    10                 {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}
     10                {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497}
     11                {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68}
     12                {40511677-D792-42A1-AD87-DEE31D887F67} = {40511677-D792-42A1-AD87-DEE31D887F67}
     13                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
     14                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    1115                {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
    1216                {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
    13                 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    14                 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68}
    15                 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497}
     17                {77D52DF7-23DD-4739-A4F4-D9BD6C1EA9AD} = {77D52DF7-23DD-4739-A4F4-D9BD6C1EA9AD}
     18                {09E86264-CA02-4A60-98EA-61BB3F460160} = {09E86264-CA02-4A60-98EA-61BB3F460160}
     19                {C8659D22-3CB7-41C9-A1BC-B40DB70A31A5} = {C8659D22-3CB7-41C9-A1BC-B40DB70A31A5}
     20                {41481057-47FD-4BEF-853B-7EF5F975F05E} = {41481057-47FD-4BEF-853B-7EF5F975F05E}
     21                {BA753941-F455-43A2-925C-7F3E02F6A995} = {BA753941-F455-43A2-925C-7F3E02F6A995}
     22                {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}
     23                {BBA88DC2-CD78-4C00-814B-183899090F3E} = {BBA88DC2-CD78-4C00-814B-183899090F3E}
     24                {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}
     25                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
     26        EndProjectSection
     27EndProject
     28Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpptcl", "cpptcl.vcproj", "{53C56131-E2AA-4A27-B460-7AC05D61A0E6}"
     29        ProjectSection(WebsiteProperties) = preProject
     30                Debug.AspNetCompiler.Debug = "True"
     31                Release.AspNetCompiler.Debug = "False"
     32        EndProjectSection
     33EndProject
     34Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "tinyxml.vcproj", "{F101C2F0-1CB9-4A57-827B-6C399A99B28F}"
     35        ProjectSection(WebsiteProperties) = preProject
     36                Debug.AspNetCompiler.Debug = "True"
     37                Release.AspNetCompiler.Debug = "False"
     38        EndProjectSection
     39EndProject
     40Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua", "tolua.vcproj", "{35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}"
     41        ProjectSection(WebsiteProperties) = preProject
     42                Debug.AspNetCompiler.Debug = "True"
     43                Release.AspNetCompiler.Debug = "False"
     44        EndProjectSection
     45        ProjectSection(ProjectDependencies) = postProject
     46                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
     47        EndProjectSection
     48EndProject
     49Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluagen_orxonox", "toluagen_orxonox.vcproj", "{71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}"
     50        ProjectSection(WebsiteProperties) = preProject
     51                Debug.AspNetCompiler.Debug = "True"
     52                Release.AspNetCompiler.Debug = "False"
     53        EndProjectSection
     54        ProjectSection(ProjectDependencies) = postProject
     55                {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34}
     56                {C6692661-9160-49E6-B109-A155F9485402} = {C6692661-9160-49E6-B109-A155F9485402}
     57                {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {8F5B7ED0-D380-4B4F-A744-3A568718176C}
     58        EndProjectSection
     59EndProject
     60Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluagen", "toluagen.vcproj", "{A0724246-CB7C-420B-BCF0-68EF205AFE34}"
     61        ProjectSection(WebsiteProperties) = preProject
     62                Debug.AspNetCompiler.Debug = "True"
     63                Release.AspNetCompiler.Debug = "False"
     64        EndProjectSection
     65        ProjectSection(ProjectDependencies) = postProject
     66                {C6692661-9160-49E6-B109-A155F9485402} = {C6692661-9160-49E6-B109-A155F9485402}
     67                {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {8F5B7ED0-D380-4B4F-A744-3A568718176C}
     68        EndProjectSection
     69EndProject
     70Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util.vcproj", "{2240ECD7-2F48-4431-8E1B-25466A384CCC}"
     71        ProjectSection(WebsiteProperties) = preProject
     72                Debug.AspNetCompiler.Debug = "True"
     73                Release.AspNetCompiler.Debug = "False"
     74        EndProjectSection
     75EndProject
     76Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core.vcproj", "{271715F3-5B90-4110-A552-70C788084A86}"
     77        ProjectSection(WebsiteProperties) = preProject
     78                Debug.AspNetCompiler.Debug = "True"
     79                Release.AspNetCompiler.Debug = "False"
     80        EndProjectSection
     81        ProjectSection(ProjectDependencies) = postProject
     82                {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}
    1683                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
    1784                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
    18                 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}
    19         EndProjectSection
    20 EndProject
    21 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpptcl", "cpptcl.vcproj", "{53C56131-E2AA-4A27-B460-7AC05D61A0E6}"
    22         ProjectSection(WebsiteProperties) = preProject
    23                 Debug.AspNetCompiler.Debug = "True"
    24                 Release.AspNetCompiler.Debug = "False"
    25         EndProjectSection
    26 EndProject
    27 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "tinyxml.vcproj", "{F101C2F0-1CB9-4A57-827B-6C399A99B28F}"
    28         ProjectSection(WebsiteProperties) = preProject
    29                 Debug.AspNetCompiler.Debug = "True"
    30                 Release.AspNetCompiler.Debug = "False"
    31         EndProjectSection
    32 EndProject
    33 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tolua", "tolua.vcproj", "{35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}"
     85                {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6}
     86                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
     87                {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
     88                {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} = {EA969DF2-70AF-46E6-BBE2-E03112E04CB8}
     89        EndProjectSection
     90EndProject
     91Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "audio.vcproj", "{4733BD1A-E04C-458D-8BFB-5010250EA497}"
     92        ProjectSection(WebsiteProperties) = preProject
     93                Debug.AspNetCompiler.Debug = "True"
     94                Release.AspNetCompiler.Debug = "False"
     95        EndProjectSection
     96        ProjectSection(ProjectDependencies) = postProject
     97                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
     98                {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
     99        EndProjectSection
     100EndProject
     101Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "network", "network.vcproj", "{35575B59-E1AE-40E8-89C4-2862B5B09B68}"
     102        ProjectSection(WebsiteProperties) = preProject
     103                Debug.AspNetCompiler.Debug = "True"
     104                Release.AspNetCompiler.Debug = "False"
     105        EndProjectSection
     106        ProjectSection(ProjectDependencies) = postProject
     107                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
     108                {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
     109        EndProjectSection
     110EndProject
     111Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua.vcproj", "{63B3E57A-4382-42F3-85EC-E869CFCCA88F}"
     112        ProjectSection(WebsiteProperties) = preProject
     113                Debug.AspNetCompiler.Debug = "True"
     114                Release.AspNetCompiler.Debug = "False"
     115        EndProjectSection
     116EndProject
     117Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ceguilua", "ceguilua.vcproj", "{4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}"
    34118        ProjectSection(WebsiteProperties) = preProject
    35119                Debug.AspNetCompiler.Debug = "True"
    … …  
    38122        ProjectSection(ProjectDependencies) = postProject
    39123                {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
    40         EndProjectSection
    41 EndProject
    42 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluagen_orxonox", "toluagen_orxonox.vcproj", "{71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}"
    43         ProjectSection(WebsiteProperties) = preProject
    44                 Debug.AspNetCompiler.Debug = "True"
    45                 Release.AspNetCompiler.Debug = "False"
    46         EndProjectSection
    47         ProjectSection(ProjectDependencies) = postProject
    48                 {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {8F5B7ED0-D380-4B4F-A744-3A568718176C}
    49                 {C6692661-9160-49E6-B109-A155F9485402} = {C6692661-9160-49E6-B109-A155F9485402}
    50                 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34}
    51         EndProjectSection
    52 EndProject
    53 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toluagen", "toluagen.vcproj", "{A0724246-CB7C-420B-BCF0-68EF205AFE34}"
    54         ProjectSection(WebsiteProperties) = preProject
    55                 Debug.AspNetCompiler.Debug = "True"
    56                 Release.AspNetCompiler.Debug = "False"
    57         EndProjectSection
    58         ProjectSection(ProjectDependencies) = postProject
    59                 {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {8F5B7ED0-D380-4B4F-A744-3A568718176C}
    60                 {C6692661-9160-49E6-B109-A155F9485402} = {C6692661-9160-49E6-B109-A155F9485402}
    61         EndProjectSection
    62 EndProject
    63 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "util.vcproj", "{2240ECD7-2F48-4431-8E1B-25466A384CCC}"
    64         ProjectSection(WebsiteProperties) = preProject
    65                 Debug.AspNetCompiler.Debug = "True"
    66                 Release.AspNetCompiler.Debug = "False"
    67         EndProjectSection
    68 EndProject
    69 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core.vcproj", "{271715F3-5B90-4110-A552-70C788084A86}"
    70         ProjectSection(WebsiteProperties) = preProject
    71                 Debug.AspNetCompiler.Debug = "True"
    72                 Release.AspNetCompiler.Debug = "False"
    73         EndProjectSection
    74         ProjectSection(ProjectDependencies) = postProject
    75                 {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} = {EA969DF2-70AF-46E6-BBE2-E03112E04CB8}
    76                 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
    77                 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    78                 {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6}
    79124                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
    80                 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
    81                 {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0} = {71FC0211-5EB5-4637-BE8A-A48EC3CC27D0}
    82         EndProjectSection
    83 EndProject
    84 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "audio.vcproj", "{4733BD1A-E04C-458D-8BFB-5010250EA497}"
    85         ProjectSection(WebsiteProperties) = preProject
    86                 Debug.AspNetCompiler.Debug = "True"
    87                 Release.AspNetCompiler.Debug = "False"
    88         EndProjectSection
    89         ProjectSection(ProjectDependencies) = postProject
    90                 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
    91                 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    92         EndProjectSection
    93 EndProject
    94 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "network", "network.vcproj", "{35575B59-E1AE-40E8-89C4-2862B5B09B68}"
    95         ProjectSection(WebsiteProperties) = preProject
    96                 Debug.AspNetCompiler.Debug = "True"
    97                 Release.AspNetCompiler.Debug = "False"
    98         EndProjectSection
    99         ProjectSection(ProjectDependencies) = postProject
    100                 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
    101                 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    102         EndProjectSection
    103 EndProject
    104 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua.vcproj", "{63B3E57A-4382-42F3-85EC-E869CFCCA88F}"
    105         ProjectSection(WebsiteProperties) = preProject
    106                 Debug.AspNetCompiler.Debug = "True"
    107                 Release.AspNetCompiler.Debug = "False"
    108         EndProjectSection
    109 EndProject
    110 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ceguilua", "ceguilua.vcproj", "{4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}"
    111         ProjectSection(WebsiteProperties) = preProject
    112                 Debug.AspNetCompiler.Debug = "True"
    113                 Release.AspNetCompiler.Debug = "False"
    114         EndProjectSection
    115         ProjectSection(ProjectDependencies) = postProject
    116                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
    117                 {63B3E57A-4382-42F3-85EC-E869CFCCA88F} = {63B3E57A-4382-42F3-85EC-E869CFCCA88F}
    118125        EndProjectSection
    119126EndProject
    … …  
    137144EndProject
    138145Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua_static", "lua_static.vcproj", "{8F5B7ED0-D380-4B4F-A744-3A568718176C}"
     146        ProjectSection(WebsiteProperties) = preProject
     147                Debug.AspNetCompiler.Debug = "True"
     148                Release.AspNetCompiler.Debug = "False"
     149        EndProjectSection
     150EndProject
     151Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogreode", "ogreode.vcproj", "{BBA88DC2-CD78-4C00-814B-183899090F3E}"
     152        ProjectSection(WebsiteProperties) = preProject
     153                Debug.AspNetCompiler.Debug = "True"
     154                Release.AspNetCompiler.Debug = "False"
     155        EndProjectSection
     156EndProject
     157Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogrebullet_collisions", "ogrebullet_collisions.vcproj", "{77D52DF7-23DD-4739-A4F4-D9BD6C1EA9AD}"
     158        ProjectSection(WebsiteProperties) = preProject
     159                Debug.AspNetCompiler.Debug = "True"
     160                Release.AspNetCompiler.Debug = "False"
     161        EndProjectSection
     162EndProject
     163Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogrebullet_dynamics", "ogrebullet_dynamics.vcproj", "{40511677-D792-42A1-AD87-DEE31D887F67}"
     164        ProjectSection(WebsiteProperties) = preProject
     165                Debug.AspNetCompiler.Debug = "True"
     166                Release.AspNetCompiler.Debug = "False"
     167        EndProjectSection
     168EndProject
     169Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bullet_collision", "bullet_collision.vcproj", "{BA753941-F455-43A2-925C-7F3E02F6A995}"
     170        ProjectSection(WebsiteProperties) = preProject
     171                Debug.AspNetCompiler.Debug = "True"
     172                Release.AspNetCompiler.Debug = "False"
     173        EndProjectSection
     174EndProject
     175Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bullet_dynamics", "bullet_dynamics.vcproj", "{41481057-47FD-4BEF-853B-7EF5F975F05E}"
     176        ProjectSection(WebsiteProperties) = preProject
     177                Debug.AspNetCompiler.Debug = "True"
     178                Release.AspNetCompiler.Debug = "False"
     179        EndProjectSection
     180EndProject
     181Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bullet_linearmath", "bullet_linearmath.vcproj", "{C8659D22-3CB7-41C9-A1BC-B40DB70A31A5}"
     182        ProjectSection(WebsiteProperties) = preProject
     183                Debug.AspNetCompiler.Debug = "True"
     184                Release.AspNetCompiler.Debug = "False"
     185        EndProjectSection
     186EndProject
     187Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bullet_softbody", "bullet_softbody.vcproj", "{09E86264-CA02-4A60-98EA-61BB3F460160}"
    139188        ProjectSection(WebsiteProperties) = preProject
    140189                Debug.AspNetCompiler.Debug = "True"
    … …  
    148197        EndGlobalSection
    149198        GlobalSection(ProjectConfigurationPlatforms) = postSolution
     199                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.ActiveCfg = Debug|Win32
     200                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.Build.0 = Debug|Win32
     201                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.ActiveCfg = Release|Win32
     202                {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.Build.0 = Release|Win32
    150203                {53C56131-E2AA-4A27-B460-7AC05D61A0E6}.Debug|Win32.ActiveCfg = Debug|Win32
    151204                {53C56131-E2AA-4A27-B460-7AC05D61A0E6}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    184237                {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Release|Win32.ActiveCfg = Release|Win32
    185238                {35575B59-E1AE-40E8-89C4-2862B5B09B68}.Release|Win32.Build.0 = Release|Win32
    186                 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.ActiveCfg = Debug|Win32
    187                 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Debug|Win32.Build.0 = Debug|Win32
    188                 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.ActiveCfg = Release|Win32
    189                 {0B6C5CFD-F91B-432A-80A3-2610F61E060B}.Release|Win32.Build.0 = Release|Win32
    190239                {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Debug|Win32.ActiveCfg = Debug|Win32
    191240                {63B3E57A-4382-42F3-85EC-E869CFCCA88F}.Debug|Win32.Build.0 = Debug|Win32
    … …  
    208257                {8F5B7ED0-D380-4B4F-A744-3A568718176C}.Release|Win32.ActiveCfg = Release|Win32
    209258                {8F5B7ED0-D380-4B4F-A744-3A568718176C}.Release|Win32.Build.0 = Release|Win32
     259                {BBA88DC2-CD78-4C00-814B-183899090F3E}.Debug|Win32.ActiveCfg = Debug|Win32
     260                {BBA88DC2-CD78-4C00-814B-183899090F3E}.Debug|Win32.Build.0 = Debug|Win32
     261                {BBA88DC2-CD78-4C00-814B-183899090F3E}.Release|Win32.ActiveCfg = Release|Win32
     262                {BBA88DC2-CD78-4C00-814B-183899090F3E}.Release|Win32.Build.0 = Release|Win32
     263                {77D52DF7-23DD-4739-A4F4-D9BD6C1EA9AD}.Debug|Win32.ActiveCfg = Debug|Win32
     264                {77D52DF7-23DD-4739-A4F4-D9BD6C1EA9AD}.Debug|Win32.Build.0 = Debug|Win32
     265                {77D52DF7-23DD-4739-A4F4-D9BD6C1EA9AD}.Release|Win32.ActiveCfg = Release|Win32
     266                {77D52DF7-23DD-4739-A4F4-D9BD6C1EA9AD}.Release|Win32.Build.0 = Release|Win32
     267                {40511677-D792-42A1-AD87-DEE31D887F67}.Debug|Win32.ActiveCfg = Debug|Win32
     268                {40511677-D792-42A1-AD87-DEE31D887F67}.Debug|Win32.Build.0 = Debug|Win32
     269                {40511677-D792-42A1-AD87-DEE31D887F67}.Release|Win32.ActiveCfg = Release|Win32
     270                {40511677-D792-42A1-AD87-DEE31D887F67}.Release|Win32.Build.0 = Release|Win32
     271                {BA753941-F455-43A2-925C-7F3E02F6A995}.Debug|Win32.ActiveCfg = Debug|Win32
     272                {BA753941-F455-43A2-925C-7F3E02F6A995}.Debug|Win32.Build.0 = Debug|Win32
     273                {BA753941-F455-43A2-925C-7F3E02F6A995}.Release|Win32.ActiveCfg = Release|Win32
     274                {BA753941-F455-43A2-925C-7F3E02F6A995}.Release|Win32.Build.0 = Release|Win32
     275                {41481057-47FD-4BEF-853B-7EF5F975F05E}.Debug|Win32.ActiveCfg = Debug|Win32
     276                {41481057-47FD-4BEF-853B-7EF5F975F05E}.Debug|Win32.Build.0 = Debug|Win32
     277                {41481057-47FD-4BEF-853B-7EF5F975F05E}.Release|Win32.ActiveCfg = Release|Win32
     278                {41481057-47FD-4BEF-853B-7EF5F975F05E}.Release|Win32.Build.0 = Release|Win32
     279                {C8659D22-3CB7-41C9-A1BC-B40DB70A31A5}.Debug|Win32.ActiveCfg = Debug|Win32
     280                {C8659D22-3CB7-41C9-A1BC-B40DB70A31A5}.Debug|Win32.Build.0 = Debug|Win32
     281                {C8659D22-3CB7-41C9-A1BC-B40DB70A31A5}.Release|Win32.ActiveCfg = Release|Win32
     282                {C8659D22-3CB7-41C9-A1BC-B40DB70A31A5}.Release|Win32.Build.0 = Release|Win32
     283                {09E86264-CA02-4A60-98EA-61BB3F460160}.Debug|Win32.ActiveCfg = Debug|Win32
     284                {09E86264-CA02-4A60-98EA-61BB3F460160}.Debug|Win32.Build.0 = Debug|Win32
     285                {09E86264-CA02-4A60-98EA-61BB3F460160}.Release|Win32.ActiveCfg = Release|Win32
     286                {09E86264-CA02-4A60-98EA-61BB3F460160}.Release|Win32.Build.0 = Release|Win32
    210287        EndGlobalSection
    211288        GlobalSection(SolutionProperties) = preSolution
    … …  
    223300                {C6692661-9160-49E6-B109-A155F9485402} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
    224301                {8F5B7ED0-D380-4B4F-A744-3A568718176C} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
     302                {BBA88DC2-CD78-4C00-814B-183899090F3E} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
     303                {77D52DF7-23DD-4739-A4F4-D9BD6C1EA9AD} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
     304                {40511677-D792-42A1-AD87-DEE31D887F67} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
     305                {BA753941-F455-43A2-925C-7F3E02F6A995} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
     306                {41481057-47FD-4BEF-853B-7EF5F975F05E} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
     307                {C8659D22-3CB7-41C9-A1BC-B40DB70A31A5} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
     308                {09E86264-CA02-4A60-98EA-61BB3F460160} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
    225309        EndGlobalSection
    226310EndGlobal

  • code/branches/physics_new/visual_studio/vc8/release.vsprops

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/tinyxml.vcproj

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/tinyxml.vsprops

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/tolua.vsprops

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/toluagen.vcproj

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/toluagen.vsprops

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/toluagen_orxonox.vcproj

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/toluagen_orxonox.vsprops

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/branches/physics_new/visual_studio/vc8/util.vsprops

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.