summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordon bright <hugh.m.bright@gmail.com>2012-05-29 00:29:29 (GMT)
committerdon bright <hugh.m.bright@gmail.com>2012-05-29 00:29:29 (GMT)
commit056f6c6131bfc5067bcac7b0e71a0ac5aa2f5753 (patch)
treebb03cfcc8ebe4cd8dc1347bc3883f4a90f4cb583
parent26b3c3633c4cce04383d4d12e9e56f8c9cb5230a (diff)
add documentation to workaround GLEWDIR bug
-rw-r--r--glew.pri1
-rwxr-xr-xscripts/linux-build-dependencies.sh9
2 files changed, 6 insertions, 4 deletions
diff --git a/glew.pri b/glew.pri
index 981d14b..f4a6ccd 100644
--- a/glew.pri
+++ b/glew.pri
@@ -5,6 +5,7 @@ glew {
!isEmpty(GLEW_DIR) {
QMAKE_INCDIR += $$GLEW_DIR/include
QMAKE_LIBDIR += $$GLEW_DIR/lib
+ QMAKE_LIBDIR += $$GLEW_DIR/lib64
message("GLEW location: $$GLEW_DIR")
}
diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh
index be2c8eb..b7f2ffc 100755
--- a/scripts/linux-build-dependencies.sh
+++ b/scripts/linux-build-dependencies.sh
@@ -129,7 +129,8 @@ build_glew()
tar xzf glew-$version.tgz
cd glew-$version
mkdir -p $DEPLOYDIR/lib/pkgconfig
- make GLEW_DEST=$DEPLOYDIR install
+ GLEW_DEST=$DEPLOYDIR make -j$NUMCPU
+ GLEW_DEST=$DEPLOYDIR make install
}
build_opencsg()
@@ -189,11 +190,11 @@ mkdir -p $SRCDIR $DEPLOYDIR
#build_boost 1.47.0
# NB! For CGAL, also update the actual download URL in the function
#build_cgal 4.0
-#build_glew 1.7.0
+build_glew 1.7.0
build_opencsg 1.3.2
echo "Now do this:"
-echo "export LD_LIBRARY_PATH=$BASEDIR/lib"
-echo "OPENSCAD_LIBRARIES=$BASEDIR qmake-qt4"
+echo "export LD_LIBRARY_PATH=$DEPLOYDIR/lib:$DEPLOYDIR/lib64"
+echo "GLEWDIR=$DEPLOYDIR OPENSCAD_LIBRARIES=$DEPLOYDIR qmake-qt4"
echo "make"
contact: Jan Huwald // Impressum