Merge branch 'master' of github.com:openscad/openscad into mingwcross1

Conflicts:
	src/linearextrude.cc

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

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);

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>