Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 13, 2009, 5:05:17 PM (15 years ago)
Author:
dafrick
Message:

Hopefully merged trunk successfully into pickup branch.

Location:
code/branches/pickup
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • code/branches/pickup

  • code/branches/pickup/src/external/bullet/BulletCollision/CMakeLists.txt

    r5781 r5935  
    11ADD_SOURCE_FILES(BULLET_FILES
     2
     3COMPILATION_BEGIN BulletCollisionCompilation.cpp
     4
    25        BroadphaseCollision/btAxisSweep3.cpp
    36        BroadphaseCollision/btBroadphaseProxy.cpp
    … …  
    6871        Gimpact/btContactProcessing.cpp
    6972        Gimpact/btGImpactShape.cpp
    70         Gimpact/gim_contact.cpp
    7173        Gimpact/btGImpactBvh.cpp
    7274        Gimpact/btGenericPoolAllocator.cpp
    73         Gimpact/gim_memory.cpp
    7475        Gimpact/btGImpactCollisionAlgorithm.cpp
    7576        Gimpact/btTriangleShapeEx.cpp
    76         Gimpact/gim_tri_collision.cpp
    7777        Gimpact/btGImpactQuantizedBvh.cpp
    78         Gimpact/gim_box_set.cpp
    7978
    8079        NarrowPhaseCollision/btContinuousConvexCollision.cpp
    … …  
    8988        NarrowPhaseCollision/btSubSimplexConvexCast.cpp
    9089        NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
     90
     91COMPILATION_END
     92
     93COMPILATION_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
     98COMPILATION_END
    9199
    92100        # Headers

  • code/branches/pickup/src/external/bullet/BulletDynamics/CMakeLists.txt

    r5781 r5935  
    11ADD_SOURCE_FILES(BULLET_FILES
     2
     3COMPILATION_BEGIN BulletDynamicsCompilation.cpp
     4
    25        ConstraintSolver/btContactConstraint.cpp
    36        ConstraintSolver/btConeTwistConstraint.cpp
    … …  
    1922
    2023        Character/btKinematicCharacterController.cpp
     24
     25COMPILATION_END
    2126
    2227        # Headers

  • code/branches/pickup/src/external/bullet/CMakeLists.txt

    r5781 r5935  
    2727ADD_SUBDIRECTORY(LinearMath)
    2828
    29 # No warnings needed from third party libraries
    30 REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
    31 ADD_COMPILER_FLAGS("-w")
    32 
    3329ORXONOX_ADD_LIBRARY(bullet_orxonox
    3430  ORXONOX_EXTERNAL
    3531  NO_DLL_INTERFACE
    36   PCH_FILE
    37     BulletPrecompiledHeaders.h
    3832  VERSION
    3933    2.74

  • code/branches/pickup/src/external/bullet/LinearMath/CMakeLists.txt

    r5781 r5935  
    11ADD_SOURCE_FILES(BULLET_FILES
     2
     3COMPILATION_BEGIN BulletLinearMathCompilation.cpp
    24                btConvexHull.cpp
    35                btQuickprof.cpp
    46                btGeometryUtil.cpp
    57                btAlignedAllocator.cpp
     8COMPILATION_END
    69
    710                # Headers
Note: See TracChangeset for help on using the changeset viewer.