forked from bartvdbraak/blender
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.
This commit is contained in:
parent
178f8400ee
commit
db62a80869
5
extern/libmv/third_party/ceres/SConscript
vendored
5
extern/libmv/third_party/ceres/SConscript
vendored
@ -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'
|
||||
|
5
extern/libmv/third_party/ceres/bundle.sh
vendored
5
extern/libmv/third_party/ceres/bundle.sh
vendored
@ -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'
|
||||
|
Loading…
Reference in New Issue
Block a user