diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-01 10:01:24 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-02 11:01:34 +0400 |
| commit | db62a808692aafb4ed3282d1b2b76894a8b71d38 (patch) | |
| tree | 90383d9713da8bd7422fed47f3ca213df5c1fdad /extern | |
| parent | 178f8400ee37e11ec5de4a64adfeaaae19cbffe6 (diff) | |
Libmv: Remove old workaround for 10.5 hash tables
We on'don't really support 10.5 anymore for my knowledge and in any case
the defined symbol was never checked in the sources, so this workaround
was basically doing nothing for quite some time now.
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/third_party/ceres/SConscript | 5 | ||||
| -rwxr-xr-x | extern/libmv/third_party/ceres/bundle.sh | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/extern/libmv/third_party/ceres/SConscript b/extern/libmv/third_party/ceres/SConscript index 44869c88d0b..f53d54ba94b 100644 --- a/extern/libmv/third_party/ceres/SConscript +++ b/extern/libmv/third_party/ceres/SConscript @@ -52,11 +52,6 @@ if env['SHARED_PTR_NAMESPACE'] == 'std::tr1': incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags ./config' -# 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/bundle.sh b/extern/libmv/third_party/ceres/bundle.sh index 0679840e126..51a463a18ad 100755 --- a/extern/libmv/third_party/ceres/bundle.sh +++ b/extern/libmv/third_party/ceres/bundle.sh @@ -255,11 +255,6 @@ if env['SHARED_PTR_NAMESPACE'] == 'std::tr1': incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags ./config' -# 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' |