Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 28, 2011, 7:15:14 AM (13 years ago)
Author:
rgrieder
Message:

Merged kicklib2 branch back to trunk (includes former branches ois_update, mac_osx and kicklib).

Notes for updating

Linux:
You don't need an extra package for CEGUILua and Tolua, it's already shipped with CEGUI.
However you do need to make sure that the OgreRenderer is installed too with CEGUI 0.7 (may be a separate package).
Also, Orxonox now recognises if you install the CgProgramManager (a separate package available on newer Ubuntu on Debian systems).

Windows:
Download the new dependency packages versioned 6.0 and use these. If you have problems with that or if you don't like the in game console problem mentioned below, you can download the new 4.3 version of the packages (only available for Visual Studio 2005/2008).

Key new features:

  • *Support for Mac OS X*
  • Visual Studio 2010 support
  • Bullet library update to 2.77
  • OIS library update to 1.3
  • Support for CEGUI 0.7 —> Support for Arch Linux and even SuSE
  • Improved install target
  • Compiles now with GCC 4.6
  • Ogre Cg Shader plugin activated for Linux if available
  • And of course lots of bug fixes

There are also some regressions:

  • No support for CEGUI 0.5, Ogre 1.4 and boost 1.35 - 1.39 any more
  • In game console is not working in main menu for CEGUI 0.7
  • Tolua (just the C lib, not the application) and CEGUILua libraries are no longer in our repository. —> You will need to get these as well when compiling Orxonox
  • And of course lots of new bugs we don't yet know about
File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/trunk/src/external/bullet/BulletCollision/CMakeLists.txt

    r5929 r8351  
    66        BroadphaseCollision/btBroadphaseProxy.cpp
    77        BroadphaseCollision/btCollisionAlgorithm.cpp
     8        BroadphaseCollision/btDbvt.cpp
     9        BroadphaseCollision/btDbvtBroadphase.cpp
    810        BroadphaseCollision/btDispatcher.cpp
    9         BroadphaseCollision/btDbvtBroadphase.cpp
    10         BroadphaseCollision/btDbvt.cpp
    1111        BroadphaseCollision/btMultiSapBroadphase.cpp
    1212        BroadphaseCollision/btOverlappingPairCache.cpp
    … …  
    1515
    1616        CollisionDispatch/btActivatingCollisionAlgorithm.cpp
     17        CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
     18        CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp
     19        CollisionDispatch/btBoxBoxDetector.cpp
    1720        CollisionDispatch/btCollisionDispatcher.cpp
    1821        CollisionDispatch/btCollisionObject.cpp
    … …  
    2023        CollisionDispatch/btCompoundCollisionAlgorithm.cpp
    2124        CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
     25        CollisionDispatch/btConvexConvexAlgorithm.cpp
     26        CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
     27        CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
    2228        CollisionDispatch/btDefaultCollisionConfiguration.cpp
    23         CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
    24         CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
    25         CollisionDispatch/btBoxBoxDetector.cpp
     29        CollisionDispatch/btEmptyCollisionAlgorithm.cpp
    2630        CollisionDispatch/btGhostObject.cpp
    27         CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
    28         CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
    29         CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
    30         CollisionDispatch/btConvexConvexAlgorithm.cpp
    31         CollisionDispatch/btEmptyCollisionAlgorithm.cpp
     31        CollisionDispatch/btInternalEdgeUtility.cpp
     32        CollisionDispatch/btInternalEdgeUtility.h
    3233        CollisionDispatch/btManifoldResult.cpp
    3334        CollisionDispatch/btSimulationIslandManager.cpp
     35        CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
     36        CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
     37        CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
    3438        CollisionDispatch/btUnionFind.cpp
    3539        CollisionDispatch/SphereTriangleDetector.cpp
    3640
    3741        CollisionShapes/btBoxShape.cpp
     42        CollisionShapes/btBox2dShape.cpp
    3843        CollisionShapes/btBvhTriangleMeshShape.cpp
    3944        CollisionShapes/btCapsuleShape.cpp
    … …  
    4348        CollisionShapes/btConeShape.cpp
    4449        CollisionShapes/btConvexHullShape.cpp
     50        CollisionShapes/btConvexInternalShape.cpp
    4551        CollisionShapes/btConvexPointCloudShape.cpp
    4652        CollisionShapes/btConvexShape.cpp
    47         CollisionShapes/btConvexInternalShape.cpp
     53        CollisionShapes/btConvex2dShape.cpp
    4854        CollisionShapes/btConvexTriangleMeshShape.cpp
    4955        CollisionShapes/btCylinderShape.cpp
    … …  
    5662        CollisionShapes/btPolyhedralConvexShape.cpp
    5763        CollisionShapes/btScaledBvhTriangleMeshShape.cpp
    58         CollisionShapes/btTetrahedronShape.cpp
     64        CollisionShapes/btShapeHull.cpp
    5965        CollisionShapes/btSphereShape.cpp
    60         CollisionShapes/btShapeHull.cpp
    6166        CollisionShapes/btStaticPlaneShape.cpp
    6267        CollisionShapes/btStridingMeshInterface.cpp
     68        CollisionShapes/btTetrahedronShape.cpp
     69        CollisionShapes/btTriangleBuffer.cpp
    6370        CollisionShapes/btTriangleCallback.cpp
    64         CollisionShapes/btTriangleBuffer.cpp
    6571        CollisionShapes/btTriangleIndexVertexArray.cpp
    6672        CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
    … …  
    6975        CollisionShapes/btUniformScalingShape.cpp
    7076
    71         Gimpact/btContactProcessing.cpp
    72         Gimpact/btGImpactShape.cpp
    73         Gimpact/btGImpactBvh.cpp
    74         Gimpact/btGenericPoolAllocator.cpp
    75         Gimpact/btGImpactCollisionAlgorithm.cpp
    76         Gimpact/btTriangleShapeEx.cpp
    77         Gimpact/btGImpactQuantizedBvh.cpp
    78 
    7977        NarrowPhaseCollision/btContinuousConvexCollision.cpp
     78        NarrowPhaseCollision/btConvexCast.cpp
     79        NarrowPhaseCollision/btGjkConvexCast.cpp
    8080        NarrowPhaseCollision/btGjkEpa2.cpp
    8181        NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
    82         NarrowPhaseCollision/btConvexCast.cpp
    83         NarrowPhaseCollision/btGjkConvexCast.cpp
    8482        NarrowPhaseCollision/btGjkPairDetector.cpp
    8583        NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
    … …  
    9189COMPILATION_END
    9290
    93 COMPILATION_BEGIN BulletGImpactCompilation.cpp
    94         Gimpact/gim_contact.cpp
    95         Gimpact/gim_memory.cpp
    96         Gimpact/gim_tri_collision.cpp
    97         Gimpact/gim_box_set.cpp
    98 COMPILATION_END
    99 
    10091        # Headers
    10192        BroadphaseCollision/btAxisSweep3.h
    … …  
    10394        BroadphaseCollision/btBroadphaseProxy.h
    10495        BroadphaseCollision/btCollisionAlgorithm.h
     96        BroadphaseCollision/btDbvt.h
     97        BroadphaseCollision/btDbvtBroadphase.h
    10598        BroadphaseCollision/btDispatcher.h
    106         BroadphaseCollision/btDbvtBroadphase.h
    107         BroadphaseCollision/btDbvt.h
    10899        BroadphaseCollision/btMultiSapBroadphase.h
    109100        BroadphaseCollision/btOverlappingPairCache.h
    … …  
    113104
    114105        CollisionDispatch/btActivatingCollisionAlgorithm.h
     106        CollisionDispatch/btBoxBoxCollisionAlgorithm.h
     107        CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h
     108        CollisionDispatch/btBoxBoxDetector.h
    115109        CollisionDispatch/btCollisionConfiguration.h
    116110        CollisionDispatch/btCollisionCreateFunc.h
    … …  
    120114        CollisionDispatch/btCompoundCollisionAlgorithm.h
    121115        CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
     116        CollisionDispatch/btConvexConvexAlgorithm.h
     117        CollisionDispatch/btConvex2dConvex2dAlgorithm.h
     118        CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
    122119        CollisionDispatch/btDefaultCollisionConfiguration.h
    123         CollisionDispatch/btSphereSphereCollisionAlgorithm.h
    124         CollisionDispatch/btBoxBoxCollisionAlgorithm.h
    125         CollisionDispatch/btBoxBoxDetector.h
     120        CollisionDispatch/btEmptyCollisionAlgorithm.h
    126121        CollisionDispatch/btGhostObject.h
    127         CollisionDispatch/btSphereBoxCollisionAlgorithm.h
    128         CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
    129         CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
    130         CollisionDispatch/btConvexConvexAlgorithm.h
    131         CollisionDispatch/btEmptyCollisionAlgorithm.h
    132122        CollisionDispatch/btManifoldResult.h
    133123        CollisionDispatch/btSimulationIslandManager.h
     124        CollisionDispatch/btSphereBoxCollisionAlgorithm.h
     125        CollisionDispatch/btSphereSphereCollisionAlgorithm.h
     126        CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
    134127        CollisionDispatch/btUnionFind.h
    135128        CollisionDispatch/SphereTriangleDetector.h
    136129
    137130        CollisionShapes/btBoxShape.h
     131        CollisionShapes/btBox2dShape.h
    138132        CollisionShapes/btBvhTriangleMeshShape.h
    139133        CollisionShapes/btCapsuleShape.h
    140         CollisionShapes/btCollisionMargin
     134        CollisionShapes/btCollisionMargin.h
    141135        CollisionShapes/btCollisionShape.h
    142136        CollisionShapes/btCompoundShape.h
    … …  
    144138        CollisionShapes/btConeShape.h
    145139        CollisionShapes/btConvexHullShape.h
     140        CollisionShapes/btConvexInternalShape.h
    146141        CollisionShapes/btConvexPointCloudShape.h
    147142        CollisionShapes/btConvexShape.h
    148         CollisionShapes/btConvexInternalShape.h
     143        CollisionShapes/btConvex2dShape.h
    149144        CollisionShapes/btConvexTriangleMeshShape.h
    150145        CollisionShapes/btCylinderShape.h
    151146        CollisionShapes/btEmptyShape.h
    152147        CollisionShapes/btHeightfieldTerrainShape.h
     148        CollisionShapes/btMaterial.h
    153149        CollisionShapes/btMinkowskiSumShape.h
    154         CollisionShapes/btMaterial.h
    155150        CollisionShapes/btMultimaterialTriangleMeshShape.h
    156151        CollisionShapes/btMultiSphereShape.h
    … …  
    158153        CollisionShapes/btPolyhedralConvexShape.h
    159154        CollisionShapes/btScaledBvhTriangleMeshShape.h
    160         CollisionShapes/btTetrahedronShape.h
     155        CollisionShapes/btShapeHull.h
    161156        CollisionShapes/btSphereShape.h
    162         CollisionShapes/btShapeHull.h
    163157        CollisionShapes/btStaticPlaneShape.h
    164158        CollisionShapes/btStridingMeshInterface.h
     159        CollisionShapes/btTetrahedronShape.h
     160        CollisionShapes/btTriangleBuffer.h
    165161        CollisionShapes/btTriangleCallback.h
    166         CollisionShapes/btTriangleBuffer.h
    167162        CollisionShapes/btTriangleIndexVertexArray.h
    168163        CollisionShapes/btTriangleIndexVertexMaterialArray.h
     164        CollisionShapes/btTriangleInfoMap.h
    169165        CollisionShapes/btTriangleMesh.h
    170166        CollisionShapes/btTriangleMeshShape.h
     167        CollisionShapes/btTriangleShape.h
    171168        CollisionShapes/btUniformScalingShape.h
    172 
    173         Gimpact/btGImpactShape.h
    174         Gimpact/gim_contact.h
    175         Gimpact/btGImpactBvh.h
    176         Gimpact/btGenericPoolAllocator.h
    177         Gimpact/gim_memory.h
    178         Gimpact/btGImpactCollisionAlgorithm.h
    179         Gimpact/btTriangleShapeEx.h
    180         Gimpact/gim_tri_collision.h
    181         Gimpact/btGImpactQuantizedBvh.h
    182         Gimpact/gim_box_set.h
    183169
    184170        NarrowPhaseCollision/btContinuousConvexCollision.h
Note: See TracChangeset for help on using the changeset viewer.