[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50654] trunk/blender/extern/libmv/ third_party/ceres/bundle.sh: Ceres: remove debug-only code from bundling script, also move osx workaround to template

Sergey Sharybin sergey.vfx at gmail.com
Sun Sep 16 14:23:00 CEST 2012


Revision: 50654
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50654
Author:   nazgul
Date:     2012-09-16 12:23:00 +0000 (Sun, 16 Sep 2012)
Log Message:
-----------
Ceres: remove debug-only code from bundling script, also move osx workaround to template

Modified Paths:
--------------
    trunk/blender/extern/libmv/third_party/ceres/bundle.sh

Modified: trunk/blender/extern/libmv/third_party/ceres/bundle.sh
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/bundle.sh	2012-09-16 11:19:36 UTC (rev 50653)
+++ trunk/blender/extern/libmv/third_party/ceres/bundle.sh	2012-09-16 12:23:00 UTC (rev 50654)
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-if false; then
 if [ "x$1" = "x--i-really-know-what-im-doing" ] ; then
   echo Proceeding as requested by command line ...
 else
@@ -37,8 +36,6 @@
 
 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`
 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`
@@ -191,6 +188,11 @@
 
 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'




More information about the Bf-blender-cvs mailing list