diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-15 04:15:24 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-15 04:15:24 +0400 |
| commit | 41729976753523ee08a0afaf6a26b6caf3dee1d6 (patch) | |
| tree | ba264fba22084f44eb50b952f375715f501acff9 /extern | |
| parent | a5f8298ea5d13d7707bc0cbf0722013276bab9d6 (diff) | |
| parent | a425790065fedb2ae49f1b79770945d8528790d9 (diff) | |
Merged changes in the trunk up to revision 50607.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/bullet2/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | extern/libmv/third_party/ceres/SConscript | 5 | ||||
| -rw-r--r-- | extern/libmv/third_party/ceres/internal/ceres/collections_port.h | 10 |
3 files changed, 17 insertions, 0 deletions
diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index 4bf26ab3794..c57474f99f2 100644 --- a/extern/bullet2/CMakeLists.txt +++ b/extern/bullet2/CMakeLists.txt @@ -314,6 +314,7 @@ set(SRC src/BulletDynamics/Character/btKinematicCharacterController.h src/BulletSoftBody/btSoftBody.h + src/BulletSoftBody/btSoftBodyInternals.h src/BulletSoftBody/btSoftBodyData.h src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h src/BulletSoftBody/btSoftBodyHelpers.h @@ -355,6 +356,7 @@ set(SRC src/btBulletCollisionCommon.h src/btBulletDynamicsCommon.h + src/Bullet-C-Api.h ) if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/extern/libmv/third_party/ceres/SConscript b/extern/libmv/third_party/ceres/SConscript index 6b5f1b8d64d..c629fa00176 100644 --- a/extern/libmv/third_party/ceres/SConscript +++ b/extern/libmv/third_party/ceres/SConscript @@ -25,6 +25,11 @@ defs.append('CERES_RESTRICT_SCHUR_SPECIALIZATION') incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags' +# work around broken hashtable in 10.5 SDK +if env['OURPLATFORM'] == 'darwin' and env['WITH_BF_BOOST']: + incs += ' ' + env['BF_BOOST_INC'] + defs.append('CERES_HASH_BOOST') + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): incs += ' ../msinttypes' diff --git a/extern/libmv/third_party/ceres/internal/ceres/collections_port.h b/extern/libmv/third_party/ceres/internal/ceres/collections_port.h index 6f8a830a85e..9dff0efe245 100644 --- a/extern/libmv/third_party/ceres/internal/ceres/collections_port.h +++ b/extern/libmv/third_party/ceres/internal/ceres/collections_port.h @@ -33,6 +33,10 @@ #ifndef CERES_INTERNAL_COLLECTIONS_PORT_H_ #define CERES_INTERNAL_COLLECTIONS_PORT_H_ +#ifdef CERES_HASH_BOOST +#include <boost/tr1/unordered_map.hpp> +#include <boost/tr1/unordered_set.hpp> +#else #if defined(_MSC_VER) && _MSC_VER <= 1700 #include <unordered_map> #include <unordered_set> @@ -40,6 +44,8 @@ #include <tr1/unordered_map> #include <tr1/unordered_set> #endif +#endif + #include <utility> #include "ceres/integral_types.h" #include "ceres/internal/port.h" @@ -118,7 +124,11 @@ CERES_HASH_NAMESPACE_START // Hasher for STL pairs. Requires hashers for both members to be defined. template<typename T> +#ifdef CERES_HASH_BOOST +struct hash { +#else struct hash<pair<T, T> > { +#endif size_t operator()(const pair<T, T>& p) const { size_t h1 = hash<T>()(p.first); size_t h2 = hash<T>()(p.second); |