Compile fixes from Giles Bathgate

git-svn-id: http://svn.clifford.at/openscad/trunk@569 b57f626f-c46c-0410-a088-ec61d464b74c

7 files changed, 12 insertions, 4 deletions

diff --git a/src/dxftess-glu.cc b/src/dxftess-glu.cc
index 73eae63..ca12ea9 100644
--- a/src/dxftess-glu.cc
+++ b/src/dxftess-glu.cc
@@ -2,6 +2,7 @@
 #include "dxfdata.h"
 #include "polyset.h"
 #include "grid.h"
+#include <stdio.h>
 
 #ifdef ENABLE_OPENCSG
 // this must be included before the GL headers
diff --git a/src/polyset.cc b/src/polyset.cc
index 47d858c..d438769 100644
--- a/src/polyset.cc
+++ b/src/polyset.cc
@@ -26,9 +26,10 @@
 #include "polyset.h"
 #include "printutils.h"
 #include "Preferences.h"
+#ifdef ENABLE_CGAL
 #include <CGAL/assertions_behaviour.h>
 #include <CGAL/exceptions.h>
-
+#endif
 #include <Eigen/Core>
 #include <Eigen/LU>
 
diff --git a/src/primitives.cc b/src/primitives.cc
index 1856cbc..ac1f0a3 100644
--- a/src/primitives.cc
+++ b/src/primitives.cc
@@ -31,6 +31,7 @@
 #include "dxftess.h"
 #include "builtin.h"
 #include "printutils.h"
+#include <assert.h>
 
 enum primitive_type_e {
 	CUBE,
diff --git a/test-code/batch-cgal-tests.sh b/test-code/batch-cgal-tests.sh
index 8b3a2b5..12b8fe1 100755
--- a/test-code/batch-cgal-tests.sh
+++ b/test-code/batch-cgal-tests.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 cmd="./cgaltest"
 
diff --git a/test-code/batch-cgal.sh b/test-code/batch-cgal.sh
index ea587be..031020d 100755
--- a/test-code/batch-cgal.sh
+++ b/test-code/batch-cgal.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 cmd="./cgaltest"
 
diff --git a/test-code/batch-dump.sh b/test-code/batch-dump.sh
index 9db4fb5..e8c9cd5 100755
--- a/test-code/batch-dump.sh
+++ b/test-code/batch-dump.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 cmd="./dumptest"
 
@@ -8,6 +8,8 @@ else
   dir=$1
 fi
 
+echo $dir;
+
 for f in $dir/*.scad; do
   echo `basename $f`
   "$cmd" "$f"
diff --git a/test-code/dumptest.pro b/test-code/dumptest.pro
index 50d3a98..a6729f7 100644
--- a/test-code/dumptest.pro
+++ b/test-code/dumptest.pro
@@ -30,6 +30,9 @@ else {
     INCLUDEPATH += /usr/include/eigen2
   }
 }
+FORMS += ../src/Preferences.ui
+HEADERS += ../src/Preferences.h
+SOURCES += ../src/Preferences.cc
 
 LEXSOURCES += ../src/lexer.l
 YACCSOURCES += ../src/parser.y