diff options
| -rw-r--r-- | openscad.pro | 5 | ||||
| -rwxr-xr-x | scripts/linux-build-dependencies.sh | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/openscad.pro b/openscad.pro index 34f8705..68aa1cc 100644 --- a/openscad.pro +++ b/openscad.pro @@ -85,9 +85,8 @@ QT += opengl # and https://github.com/openscad/openscad/pull/119 # ( QT += opengl does not automatically link glu on some DSO systems. ) unix:!macx { - !contains ( QMAKE_LIBS_OPENGL, "-lGLU" ) { - QMAKE_LIBS_OPENGL += -lGLU - } + QMAKE_LIBS_OPENGL *= -lGLU + QMAKE_LIBS_OPENGL *= -lX11 } netbsd* { diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh index caa9ac4..36dc2ee 100755 --- a/scripts/linux-build-dependencies.sh +++ b/scripts/linux-build-dependencies.sh @@ -159,8 +159,11 @@ build_glew() 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 + # Fedora 64-bit + if [ "`ls /usr/lib64 | grep Xmu`" ]; then + echo "modifying glew makefile for 64 bit machine" + sed -ibak s/"\-lXmu"/"\-L\/usr\/lib64\/libXmu.so.6"/ config/Makefile.linux + fi GLEW_DEST=$DEPLOYDIR make -j$NUMCPU GLEW_DEST=$DEPLOYDIR make install @@ -177,10 +180,13 @@ build_opencsg() fi tar xzf OpenCSG-$version.tar.gz cd OpenCSG-$version - sed -i s/example// opencsg.pro # examples might be broken without GLUT + sed -ibak 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 + # Fedora 64-bit + if [ "`ls /usr/lib64 | grep Xmu`" ]; then + echo "modifying opencsg makefile for 64 bit machine" + sed -ibak s/"\-lXmu"/"\-L\/usr\/lib64\/libXmu.so.6"/ src/Makefile + fi if [ "`command -v qmake-qt4`" ]; then qmake-qt4 |