forked from bartvdbraak/blender
Ceres: remove debug-only code from bundling script, also move osx workaround to template
This commit is contained in:
parent
a9d9bf7909
commit
d066ce9533
8
extern/libmv/third_party/ceres/bundle.sh
vendored
8
extern/libmv/third_party/ceres/bundle.sh
vendored
@ -1,6 +1,5 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
if false; then
|
|
||||||
if [ "x$1" = "x--i-really-know-what-im-doing" ] ; then
|
if [ "x$1" = "x--i-really-know-what-im-doing" ] ; then
|
||||||
echo Proceeding as requested by command line ...
|
echo Proceeding as requested by command line ...
|
||||||
else
|
else
|
||||||
@ -37,8 +36,6 @@ done
|
|||||||
|
|
||||||
rm -rf $tmp
|
rm -rf $tmp
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
sources=`find ./include ./internal -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t/' | grep -v -E 'schur_eliminator_[0-9]_[0-9]_[0-9d].cc' | sort -d`
|
sources=`find ./include ./internal -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t/' | grep -v -E 'schur_eliminator_[0-9]_[0-9]_[0-9d].cc' | sort -d`
|
||||||
generated_sources=`find ./include ./internal -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//#\t\t/' | grep -E 'schur_eliminator_[0-9]_[0-9]_[0-9d].cc' | sort -d`
|
generated_sources=`find ./include ./internal -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//#\t\t/' | grep -E 'schur_eliminator_[0-9]_[0-9]_[0-9d].cc' | sort -d`
|
||||||
headers=`find ./include ./internal -type f -iname '*.h' | sed -r 's/^\.\//\t/' | sort -d`
|
headers=`find ./include ./internal -type f -iname '*.h' | sed -r 's/^\.\//\t/' | sort -d`
|
||||||
@ -191,6 +188,11 @@ defs.append('CERES_RESTRICT_SCHUR_SPECIALIZATION')
|
|||||||
|
|
||||||
incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags'
|
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', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
|
||||||
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
|
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
|
||||||
incs += ' ../msinttypes'
|
incs += ' ../msinttypes'
|
||||||
|
Loading…
Reference in New Issue
Block a user