Merge branch 'master' and fix bugs

Conflicts:
	src/openscad.cc
	tests/CMakeLists.txt

4 files changed, 27 insertions, 5 deletions

diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh
index eaed556..6a3e637 100755
--- a/scripts/check-dependencies.sh
+++ b/scripts/check-dependencies.sh
@@ -449,7 +449,7 @@ check_old_local()
   warnon=
   if [ "`uname | grep -i linux`" ]; then
     header_list="opencsg.h CGAL boost GL/glew.h gmp.h mpfr.h eigen2 eigen3"
-    liblist="libboost libopencsg libCGAL libglew"
+    liblist="libboost_system libboost_system-mt libopencsg libCGAL libglew"
     for i in $header_list $liblist; do
       if [ -e /usr/local/include/$i ]; then
         echo "Warning: you have a copy of "$i" under /usr/local/include"
diff --git a/scripts/installer.nsi b/scripts/installer.nsi
index 87ec18d..1841431 100644
--- a/scripts/installer.nsi
+++ b/scripts/installer.nsi
@@ -6,6 +6,7 @@ DirText "This will install OpenSCAD on your computer. Choose a directory"
 Section "install"
 SetOutPath $INSTDIR
 File openscad.exe
+File openscad.com
 File /r /x mingw-cross-env examples
 File /r /x mingw-cross-env libraries
 ${registerExtension} "$INSTDIR\openscad.exe" ".scad" "OpenSCAD_File"
diff --git a/scripts/release-common.sh b/scripts/release-common.sh
index ae856df..de14cb1 100755
--- a/scripts/release-common.sh
+++ b/scripts/release-common.sh
@@ -166,7 +166,14 @@ fi
 case $OS in
     LINXWIN)
         # dont use paralell builds, it can error-out on parser_yacc.
+
+        # make main openscad.exe
         cd $DEPLOYDIR && make $TARGET
+
+        # make console pipe-able openscad.com - see winconsole.pri for info
+        i686-pc-mingw32-qmake CONFIG+=winconsole ../openscad.pro
+        make
+
         cd $OPENSCADDIR
     ;;
     *)
@@ -232,6 +239,7 @@ case $OS in
         #package
         cp win32deps/* openscad-$VERSION
         cp $TARGET/openscad.exe openscad-$VERSION
+        cp $TARGET/openscad.com openscad-$VERSION
         rm -f openscad-$VERSION.zip
         "$ZIP" $ZIPARGS openscad-$VERSION.zip openscad-$VERSION
         rm -rf openscad-$VERSION
@@ -242,6 +250,7 @@ case $OS in
         echo "Creating binary package"
         cd $DEPLOYDIR
         cp $TARGET/openscad.exe openscad-$VERSION
+        cp $TARGET/openscad.com openscad-$VERSION
         rm -f OpenSCAD-$VERSION.zip
         "$ZIP" $ZIPARGS OpenSCAD-$VERSION.zip openscad-$VERSION
         cd $OPENSCADDIR
diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh
index 0c37605..3da11ec 100755
--- a/scripts/uni-build-dependencies.sh
+++ b/scripts/uni-build-dependencies.sh
@@ -176,15 +176,27 @@ build_boost()
     fi
   fi
   # We only need certain portions of boost
-  ./bootstrap.sh --prefix=$DEPLOYDIR --with-libraries=thread,program_options,filesystem,system,regex
+  if [ -e ./bootstrap.sh ]; then
+    BSTRAPBIN=./bootstrap.sh
+  else
+    BSTRAPBIN=./configure
+  fi
+  $BSTRAPBIN --prefix=$DEPLOYDIR --with-libraries=thread,program_options,filesystem,system,regex
+	if [ -e ./b2 ]; then
+    BJAMBIN=./b2;
+  elif [ -e ./bjam ]; then
+    BJAMBIN=./bjam
+  elif [ -e ./Makefile ]; then
+    BJAMBIN=make
+  fi
   if [ $CXX ]; then
     if [ $CXX = "clang++" ]; then
-      ./b2 -j$NUMCPU toolset=clang install
+      $BJAMBIN -j$NUMCPU toolset=clang install
       # ./b2 -j$NUMCPU toolset=clang cxxflags="-stdlib=libc++" linkflags="-stdlib=libc++" install
     fi
   else
-    ./b2 -j$NUMCPU
-    ./b2 install
+    $BJAMBIN -j$NUMCPU
+    $BJAMBIN install
   fi
 }