Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 28, 2011, 10:40:10 PM (14 years ago)
Author:
rgrieder
Message:

Since we already have it now: use automatic full build units for external dependencies, even in "partial" mode.
That will not actually change anything except that Bullet is now built in a single unit instead of 3.

Location:
code/branches/unity_build/src/external/bullet
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r8558 r8653  
    11ADD_SOURCE_FILES(BULLET_FILES
    2 
    3 BUILD_UNIT BulletCollisionBuildUnit.cpp
    42
    53        BroadphaseCollision/btAxisSweep3.cpp
    … …  
    8482        NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
    8583        NarrowPhaseCollision/btPersistentManifold.cpp
     84        NarrowPhaseCollision/btPolyhedralContactClipping.cpp
    8685        NarrowPhaseCollision/btRaycastCallback.cpp
    8786        NarrowPhaseCollision/btSubSimplexConvexCast.cpp
    8887        NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
    8988
    90 END_BUILD_UNIT
    91 
    92     # Raises compiler errors when compiled inside the build unit
    93         NarrowPhaseCollision/btPolyhedralContactClipping.cpp
    9489
    9590        # Headers

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

    r8558 r8653  
    11ADD_SOURCE_FILES(BULLET_FILES
    2 
    3 BUILD_UNIT BulletDynamicsBuildUnit.cpp
    42
    53        Character/btKinematicCharacterController.cpp
    … …  
    2523        Vehicle/btRaycastVehicle.cpp
    2624        Vehicle/btWheelInfo.cpp
    27 
    28 END_BUILD_UNIT
    2925
    3026        # Headers

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

    r8393 r8653  
    3232  VERSION
    3333    2.78
     34  EXCLUDE_FROM_BUILD_UNITS
     35    BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp
    3436  SOURCE_FILES
    3537    ${BULLET_FILES}

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

    r8558 r8653  
    11ADD_SOURCE_FILES(BULLET_FILES
    22
    3 BUILD_UNIT BulletLinearMathBuildUnit.cpp
    43        btAlignedAllocator.cpp
    54        btConvexHull.cpp
    … …  
    87        btQuickprof.cpp
    98        btSerializer.cpp
    10 END_BUILD_UNIT
    119
    1210        # Headers
Note: See TracChangeset for help on using the changeset viewer.