Changeset 1556


Ignore:
Timestamp:
Jul 2, 2012, 2:04:11 AM (8 years ago)
Author:
sam
Message:

contrib: clean up the BulletPhysics contrib directory.

Location:
trunk
Files:
15 added
35 deleted
2 edited
181 copied

Legend:

Unmodified
Added
Removed
  • trunk/build/vs2010/Lol.Core.Vars.props

    r1554 r1556  
    2222    <!-- BulletPhysics -->
    2323    <BtPhysDir>$(ContribDir)\bullet-2.80-rev2531</BtPhysDir>
    24     <BtPhysIncludes>$(BtPhysDir)\src</BtPhysIncludes>
     24    <BtPhysIncludes>$(BtPhysDir)\include</BtPhysIncludes>
    2525    <BtPhysLibs Condition="'$(Platform)'=='Win32'">$(BtPhysDir)\lib</BtPhysLibs>
    26     <BtPhysDeps Condition="'$(Platform)'=='Win32'">BulletCollision.lib;BulletDynamics.lib;BulletSoftBody.lib;ConvexDecomposition.lib;HACD.lib;LinearMath.lib;OpenGLSupport.lib</BtPhysDeps>
     26    <BtPhysDeps Condition="'$(Platform)'=='Win32'">BulletCollision.lib;BulletDynamics.lib;BulletSoftBody.lib;LinearMath.lib</BtPhysDeps>
    2727    <Win32Defines>$(Win32Defines)</Win32Defines>
    2828
  • trunk/test/BtPhysTest.cpp

    r1554 r1556  
    3333#endif
    3434
     35#include <bullet/btBulletDynamicsCommon.h>
     36#include <bullet/btBulletCollisionCommon.h>
     37
    3538#include "core.h"
    3639#include "loldebug.h"
    37 #include <cstdio>
    3840
    3941using namespace lol;
    4042
    41 #include "btBulletDynamicsCommon.h"
    42 #include "btBulletCollisionCommon.h"
    4343#include "BtPhysTest.h"
    4444
Note: See TracChangeset for help on using the changeset viewer.