From bbef180a218aa59f03ea7bcf389ff3d1a357907d Mon Sep 17 00:00:00 2001 From: don bright Date: Tue, 3 Jul 2012 22:27:31 -0700 Subject: [PATCH] kludge-fix for broken Makefiles for opencsg + glew on Fedora 64bit --- scripts/linux-build-dependencies.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh index a789e9d0..286399bf 100755 --- a/scripts/linux-build-dependencies.sh +++ b/scripts/linux-build-dependencies.sh @@ -16,7 +16,7 @@ BASEDIR=$HOME/openscad_deps OPENSCADDIR=$PWD SRCDIR=$BASEDIR/src DEPLOYDIR=$BASEDIR -NUMCPU=4 # paralell builds for some libraries +NUMCPU=2 # paralell builds for some libraries printUsage() { @@ -145,6 +145,10 @@ build_glew() tar xzf glew-$version.tgz cd glew-$version mkdir -p $DEPLOYDIR/lib/pkgconfig + + # uncomment this kludge for Fedora 64bit + # sed -i s/"\-lXmu"/"\-L\/usr\/lib64\/libXmu.so.6"/ config/Makefile.linux + GLEW_DEST=$DEPLOYDIR make -j$NUMCPU GLEW_DEST=$DEPLOYDIR make install } @@ -161,6 +165,10 @@ build_opencsg() tar xzf OpenCSG-$version.tar.gz cd OpenCSG-$version sed -i s/example// opencsg.pro # examples might be broken without GLUT + + # uncomment this kludge for Fedora 64bit + # sed -i s/"\-lXmu"/"\-L\/usr\/lib64\/libXmu.so.6"/ src/Makefile + qmake-qt4 make install -v lib/* $DEPLOYDIR/lib