diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-07-20 22:01:17 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-07-20 22:01:17 (GMT) |
| commit | 448bb1436011b90764a5b5626ad1a36fd99a5381 (patch) | |
| tree | ba66146f55c829a0273f3c12bdc66f42114f7361 | |
| parent | b22951af47f7cbb5a7db60765f6ab188544fffbe (diff) | |
improve clang build of glew and opencsg
| -rwxr-xr-x | scripts/linux-build-dependencies.sh | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh index e8a43b3..4f1f7e7 100755 --- a/scripts/linux-build-dependencies.sh +++ b/scripts/linux-build-dependencies.sh @@ -167,10 +167,12 @@ build_glew() mkdir -p $DEPLOYDIR/lib/pkgconfig # 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 + if [ -e /usr/lib64 ]; then + 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 + fi if [ $CC ]; then if [ $CC = "clang" ]; then @@ -197,23 +199,25 @@ build_opencsg() sed -ibak s/example// opencsg.pro # examples might be broken without GLUT # 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 [ -e /usr/lib64 ]; then + 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 + fi if [ "`command -v qmake-qt4`" ]; then - OPCSG_QM = qmake-qt4 + OPENCSG_QMAKE=qmake-qt4 else - OPCSG_QM = qmake + OPENCSG_QMAKE=qmake fi if [ $CXX ]; then if [ $CXX = "clang++" ]; then - cd $BASEDIR/src/opencsg-$version/src - $(OPCSG_QM) - cd $BASEDIR/src/opencsg-$version - $(OPCSG_QM) + cd $BASEDIR/src/OpenCSG-$version/src + $OPCSG_QMAKE + cd $BASEDIR/src/OpenCSG-$version + $OPCSG_QMAKE fi fi |