3 files changed, 21 insertions, 7 deletions
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh
index 6de5331..0ed375f 100755
--- a/scripts/macosx-build-dependencies.sh
+++ b/scripts/macosx-build-dependencies.sh
@@ -125,7 +125,7 @@ build_cgal()
   tar xzf CGAL-$version.tar.gz
   cd CGAL-$version
   # We build a static lib. Not really necessary, but it's well tested.
-  cmake -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR -DBUILD_SHARED_LIBS=FALSE -DCMAKE_OSX_DEPLOYMENT_TARGET="10.5" -DCMAKE_OSX_ARCHITECTURES="i386;x86_64"
+  cmake -DCMAKE_INSTALL_PREFIX=$DEPLOYDIR -DBUILD_SHARED_LIBS=FALSE -DCMAKE_OSX_DEPLOYMENT_TARGET="10.5" -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" -DBOOST_ROOT=$DEPLOYDIR
   make -j4
   make install
 }
@@ -135,6 +135,7 @@ build_glew()
   version=$1
   echo "Building GLEW" $version "..."
   cd $BASEDIR/src
+  rm -r glew-*
   curl -LO http://downloads.sourceforge.net/project/glew/glew/$version/glew-$version.tgz
   tar xzf glew-$version.tgz
   cd glew-$version
@@ -152,6 +153,7 @@ build_opencsg()
   curl -O http://www.opencsg.org/OpenCSG-$version.tar.gz
   tar xzf OpenCSG-$version.tar.gz
   cd OpenCSG-$version
+  patch -p1 < $OPENSCADDIR/patches/OpenCSG-$version-FBO.patch
   patch -p1 < $OPENSCADDIR/patches/OpenCSG-$version-MacOSX-port.patch
   MACOSX_DEPLOY_DIR=$DEPLOYDIR qmake -r CONFIG+="x86 x86_64"
   make install
diff --git a/scripts/release-common.sh b/scripts/release-common.sh
index 340266d..9261d7a 100755
--- a/scripts/release-common.sh
+++ b/scripts/release-common.sh
@@ -80,17 +80,29 @@ echo "Creating directory structure..."
 case $OS in
     MACOSX)
         EXAMPLESDIR=OpenSCAD.app/Contents/Resources/examples
+        LIBRARYDIR=OpenSCAD.app/Contents/Resources/libraries
     ;;
     *)
         EXAMPLESDIR=openscad-$VERSION/examples/
+        LIBRARYDIR=openscad-$VERSION/libraries/
         rm -rf openscad-$VERSION
         mkdir openscad-$VERSION
     ;;
 esac
 
-mkdir -p $EXAMPLESDIR
-cp examples/* $EXAMPLESDIR
-chmod -R 644 $EXAMPLESDIR/*
+if [ -n $EXAMPLESDIR ]; then
+  echo $EXAMPLESDIR
+  mkdir -p $EXAMPLESDIR
+  cp examples/* $EXAMPLESDIR
+  chmod -R 644 $EXAMPLESDIR/*
+fi
+if [ -n $LIBRARYDIR ]; then
+  echo $LIBRARYDIR
+  mkdir -p $LIBRARYDIR
+  cp -R libraries/* $LIBRARYDIR
+  chmod -R u=rwx,go=r,+X $LIBRARYDIR/*
+  rm -rf `find $LIBRARYDIR -name ".git"`
+fi
 
 echo "Creating archive.."
 
diff --git a/scripts/release-linux.sh b/scripts/release-linux.sh
index 35d177f..7675c07 100755
--- a/scripts/release-linux.sh
+++ b/scripts/release-linux.sh
@@ -87,6 +87,6 @@ chmod 755 -R release/
 cp examples/* release/examples/
 chmod 644 -R release/examples/*
 
-cp libraries/* release/libraries/
-chmod 644 -R release/libraries/*
-
+cp -R libraries/* release/libraries/
+chmod -R u=rwx,go=r,+X release/libraries/*
+rm -rf `find release/libraries -name ".git"`