diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2013-02-19 01:45:37 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2013-02-19 01:45:37 (GMT) |
| commit | 3fc620c9659c61dc074393da7a5ff0f731eef0ed (patch) | |
| tree | 805197154702fa3a7f424478801fc766c5074d1f /scripts/uni-build-dependencies.sh | |
| parent | c5eb57eb197c8d846174ddc00aa6c97056d6c2d0 (diff) | |
new upload design using python paramiko. also fix glew bugs.
Diffstat (limited to 'scripts/uni-build-dependencies.sh')
| -rwxr-xr-x | scripts/uni-build-dependencies.sh | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh index 8a7dda1..b5937ed 100755 --- a/scripts/uni-build-dependencies.sh +++ b/scripts/uni-build-dependencies.sh @@ -306,7 +306,14 @@ build_cgal() build_glew() { - if [ -e $DEPLOYDIR/include/GL/glew.h ]; then + GLEW_INSTALLED= + if [ -e $DEPLOYDIR/lib64/libGLEW.so ]; then + GLEW_INSTALLED=1 + fi + if [ -e $DEPLOYDIR/lib/libGLEW.so ]; then + GLEW_INSTALLED=1 + fi + if [ $GLEW_INSTALLED ]; then echo "glew already installed. not building" return fi @@ -499,29 +506,29 @@ if [ "`cmake --version | grep 'version 2.[1-6][^0-9]'`" ]; then build_cmake 2.8.8 fi -build_git 1.7.10.3 -exit 1 -# Singly build CGAL or OpenCSG -# (Most systems have all libraries available as packages except CGAL/OpenCSG) -# (They can be built singly here by passing a command line arg to the script) +# Singly build certain tools or libraries if [ $1 ]; then + if [ $1 == "git" ]; then + build_git 1.7.10.3 + exit $? + fi if [ $1 = "cgal" ]; then build_cgal 4.0.2 use-sys-libs - exit + exit $? fi if [ $1 = "opencsg" ]; then build_opencsg 1.3.2 - exit + exit $? fi if [ $1 == "qt4" ]; then # such a huge build, put here by itself build_qt4 4.8.4 - exit + exit $? fi if [ $1 == "glu" ]; then # Mesa and GLU split in late 2012, so it's not on some systems build_glu 9.0.0 - exit + exit $? fi fi |