diff options
author | Benoit Bolsee <benoit.bolsee@online.be> | 2011-09-07 19:34:04 +0400 |
---|---|---|
committer | Benoit Bolsee <benoit.bolsee@online.be> | 2011-09-07 19:34:04 +0400 |
commit | dbd6658d737b1592a633ddf6397be14e50e434d9 (patch) | |
tree | 57081721d70622a3c3141909b258f9bce8a5b1e3 /extern | |
parent | b5bd86e5907c3fa98546dabeda9703dfb15862f4 (diff) | |
parent | 884fc84793be1c5fdd6643ad267331381f8e1c6b (diff) |
svn merge -r 37306:39975 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'extern')
-rw-r--r-- | extern/binreloc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | extern/bullet2/CMakeLists.txt | 23 | ||||
-rw-r--r-- | extern/bullet2/src/SConscript | 4 | ||||
-rw-r--r-- | extern/glew/CMakeLists.txt | 6 | ||||
-rw-r--r-- | extern/libopenjpeg/CMakeLists.txt | 4 | ||||
-rw-r--r-- | extern/lzo/CMakeLists.txt | 2 |
6 files changed, 34 insertions, 7 deletions
diff --git a/extern/binreloc/CMakeLists.txt b/extern/binreloc/CMakeLists.txt index a4f85a2fdfd..753e28091d3 100644 --- a/extern/binreloc/CMakeLists.txt +++ b/extern/binreloc/CMakeLists.txt @@ -19,7 +19,7 @@ # set(INC - ./include + include ) set(INC_SYS diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index bfc4b31689e..9cead6546b8 100644 --- a/extern/bullet2/CMakeLists.txt +++ b/extern/bullet2/CMakeLists.txt @@ -149,6 +149,15 @@ set(SRC src/LinearMath/btGeometryUtil.cpp src/LinearMath/btQuickprof.cpp src/LinearMath/btSerializer.cpp + # UNUSED + # src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp + # src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp + # src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp + # src/BulletCollision/CollisionShapes/btBox2dShape.cpp + # src/BulletCollision/CollisionShapes/btConvex2dShape.cpp + # src/BulletDynamics/Character/btKinematicCharacterController.cpp + # src/BulletDynamics/ConstraintSolver/btHinge2Constraint.cpp + # src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp src/Bullet-C-Api.h src/BulletCollision/BroadphaseCollision/btAxisSweep3.h @@ -217,6 +226,7 @@ set(SRC src/BulletCollision/CollisionShapes/btTriangleCallback.h src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h + src/BulletCollision/CollisionShapes/btTriangleInfoMap.h src/BulletCollision/CollisionShapes/btTriangleMesh.h src/BulletCollision/CollisionShapes/btTriangleMeshShape.h src/BulletCollision/CollisionShapes/btTriangleShape.h @@ -264,6 +274,7 @@ set(SRC src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h + src/BulletDynamics/Character/btCharacterControllerInterface.h src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h src/BulletDynamics/ConstraintSolver/btConstraintSolver.h src/BulletDynamics/ConstraintSolver/btContactConstraint.h @@ -291,9 +302,12 @@ set(SRC src/BulletSoftBody/btDefaultSoftBodySolver.h src/BulletSoftBody/btSoftBody.h src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h + src/BulletSoftBody/btSoftBodyData.h src/BulletSoftBody/btSoftBodyHelpers.h src/BulletSoftBody/btSoftBodyInternals.h src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h + src/BulletSoftBody/btSoftBodySolverVertexBuffer.h + src/BulletSoftBody/btSoftBodySolvers.h src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h src/BulletSoftBody/btSoftRigidDynamicsWorld.h src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h @@ -323,9 +337,16 @@ set(SRC src/LinearMath/btTransform.h src/LinearMath/btTransformUtil.h src/LinearMath/btVector3.h - src/btBulletCollisionCommon.h src/btBulletDynamicsCommon.h + # src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h + # src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h + # src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h + # src/BulletCollision/CollisionShapes/btBox2dShape.h + # src/BulletCollision/CollisionShapes/btConvex2dShape.h + # src/BulletDynamics/Character/btKinematicCharacterController.h + # src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h + # src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h ) if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/extern/bullet2/src/SConscript b/extern/bullet2/src/SConscript index 5cb9185d6a1..fa00ad7bc2e 100644 --- a/extern/bullet2/src/SConscript +++ b/extern/bullet2/src/SConscript @@ -11,10 +11,10 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): defs += ' WIN32 NDEBUG _WINDOWS' #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op'] cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs'] -elif env['OURPLATFORM']=='win32-mingw': +elif env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'): defs += ' NDEBUG' cflags += ['-O2'] -elif sys.platform=='linux2' or sys.platform=='linux-i386' or sys.platform=='freebsd4' or sys.platform=='freebsd5': +elif env['OURPLATFORM'] in ('linux', 'freebsd4', 'freebsd5'): defs += ' NDEBUG' cflags += ['-O2'] elif sys.platform=='darwin': diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt index 35beacab6a3..87f8bb6e940 100644 --- a/extern/glew/CMakeLists.txt +++ b/extern/glew/CMakeLists.txt @@ -25,7 +25,7 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - ./include + include ) set(INC_SYS @@ -33,7 +33,9 @@ set(INC_SYS ) if(UNIX) - list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH}) + list(APPEND INC_SYS + ${X11_X11_INCLUDE_PATH} + ) endif() set(SRC diff --git a/extern/libopenjpeg/CMakeLists.txt b/extern/libopenjpeg/CMakeLists.txt index fe03db83054..6f5056b341a 100644 --- a/extern/libopenjpeg/CMakeLists.txt +++ b/extern/libopenjpeg/CMakeLists.txt @@ -32,6 +32,10 @@ set(INC_SYS ) +if(WIN32) + add_definitions(-DOPJ_STATIC) +endif() + set(SRC bio.c cio.c diff --git a/extern/lzo/CMakeLists.txt b/extern/lzo/CMakeLists.txt index 10ea2c58f7c..11eb18520b6 100644 --- a/extern/lzo/CMakeLists.txt +++ b/extern/lzo/CMakeLists.txt @@ -25,7 +25,7 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - include + ) set(INC_SYS |