diff options
| author | Marius Kintel <marius@kintel.net> | 2013-05-25 19:21:17 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-05-25 19:21:17 (GMT) |
| commit | 9740232b080ac3d2fe87309fb51a892faf6ea913 (patch) | |
| tree | 974ac256413de1111a085d12cad7bc3f755792dd /scripts/uni-build-dependencies.sh | |
| parent | fef8dba56bae76f6e876656cee603fc895fa0955 (diff) | |
| parent | e60744776193d5dc3f22e7a4a9f3afa8b8664e30 (diff) | |
Merge branch 'master' into issue364
Diffstat (limited to 'scripts/uni-build-dependencies.sh')
| -rwxr-xr-x | scripts/uni-build-dependencies.sh | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh index bfc830f..60dbb74 100755 --- a/scripts/uni-build-dependencies.sh +++ b/scripts/uni-build-dependencies.sh @@ -408,8 +408,21 @@ build_opencsg() OPENCSG_QMAKE=qmake-qt4 elif [ "`command -v qmake4`" ]; then OPENCSG_QMAKE=qmake4 - else + elif [ "`command -v qmake`" ]; then OPENCSG_QMAKE=qmake + else + echo qmake not found... using standard OpenCSG makefiles + OPENCSG_QMAKE=make + cp Makefile Makefile.bak + cp src/Makefile src/Makefile.bak + + cat Makefile.bak | sed s/example// |sed s/glew// > Makefile + cat src/Makefile.bak | sed s@^INCPATH.*@INCPATH\ =\ -I$BASEDIR/include\ -I../include\ -I..\ -I.@ > src/Makefile + cp src/Makefile src/Makefile.bak2 + cat src/Makefile.bak2 | sed s@^LIBS.*@LIBS\ =\ -L$BASEDIR/lib\ -L/usr/X11R6/lib\ -lGLU\ -lGL@ > src/Makefile + tmp=$version + build_glu 9.0.0 # todo - autodetect the need for glu + version=$tmp fi cd $BASEDIR/src/OpenCSG-$version/src @@ -562,7 +575,7 @@ fi build_eigen 3.1.1 build_gmp 5.0.5 build_mpfr 3.1.1 -build_boost 1.49.0 +build_boost 1.53.0 # NB! For CGAL, also update the actual download URL in the function build_cgal 4.1 build_glew 1.9.0 |