diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-07-15 20:06:23 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-07-15 20:06:23 (GMT) |
| commit | 10619bdb494b675cb7f7136397ceb9324b1671aa (patch) | |
| tree | 8701b1e32fddc009c35fc5be785ec7bcaaffcce1 | |
| parent | 8e1fee3de7bf17af19461bc3b0aedc683d5634d9 (diff) | |
| parent | 8cc442369fa95b61b2a475f7cd1d63f3ab7ca713 (diff) | |
Merge branch 'master' of github.com:openscad/openscad into mingwcross1
Conflicts:
src/linearextrude.cc
| -rwxr-xr-x | scripts/linux-build-dependencies.sh | 16 | ||||
| -rw-r--r-- | src/import.cc | 2 | ||||
| -rw-r--r-- | src/value.cc | 3 |
3 files changed, 7 insertions, 14 deletions
diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh index f15110d..caa9ac4 100755 --- a/scripts/linux-build-dependencies.sh +++ b/scripts/linux-build-dependencies.sh @@ -11,14 +11,6 @@ # - Qt4 # -BASEDIR=$HOME/openscad_deps -OPENSCADDIR=$PWD -SRCDIR=$BASEDIR/src -DEPLOYDIR=$BASEDIR -if [ ! $NUMCPU ]; then - NUMCPU=1 # paralell builds for some libraries -fi - printUsage() { echo "Usage: $0" @@ -222,7 +214,6 @@ build_eigen() } - OPENSCADDIR=$PWD if [ ! -f $OPENSCADDIR/openscad.pro ]; then echo "Must be run from the OpenSCAD source root directory" @@ -231,9 +222,10 @@ fi . ./scripts/setenv-linbuild.sh # '.' is equivalent to 'source' SRCDIR=$BASEDIR/src -DEPLOYDIR=$BASEDIR + if [ ! $NUMCPU ]; then - NUMCPU=1 # paralell builds for some libraries + echo "Note: The NUMCPU environment variable can be set for paralell builds" + NUMCPU=1 fi if [ ! -d $BASEDIR/bin ]; then @@ -243,7 +235,7 @@ fi echo "Using basedir:" $BASEDIR echo "Using deploydir:" $DEPLOYDIR echo "Using srcdir:" $SRCDIR -echo "Number of CPUs for parallel builds:" $NUMCPU "(export NUMCPU=x to modify)" +echo "Number of CPUs for parallel builds:" $NUMCPU mkdir -p $SRCDIR $DEPLOYDIR if [ ! "`command -v curl`" ]; then diff --git a/src/import.cc b/src/import.cc index 7c8091c..dc40c8d 100644 --- a/src/import.cc +++ b/src/import.cc @@ -118,7 +118,7 @@ PolySet *ImportNode::evaluate_polyset(class PolySetEvaluator *) const if (this->type == TYPE_STL) { - handle_dep(this->filename); + handle_dep((std::string)this->filename); std::ifstream f(this->filename.c_str(), std::ios::in | std::ios::binary); if (!f.good()) { PRINTB("WARNING: Can't open import file '%s'.", this->filename); diff --git a/src/value.cc b/src/value.cc index 2602f32..666062a 100644 --- a/src/value.cc +++ b/src/value.cc @@ -25,7 +25,8 @@ */ #include "value.h" -#include <assert.h> +#include <math.h> +#include <assert.h> // fmod #include <sstream> #include <boost/foreach.hpp> #include <boost/variant/apply_visitor.hpp> |