diff options
| author | Marius Kintel <marius@kintel.net> | 2012-08-20 12:56:40 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-08-20 12:56:40 (GMT) |
| commit | 6b32e38e2a6fede1f143968c82341e880ab0ed3c (patch) | |
| tree | 140411d8f5f5acc9c80586c98cccf36189465f3d /scripts | |
| parent | 63882721d773eab3aa49454a3b33a8a524d72beb (diff) | |
| parent | c6eeb1a1c5da072e1c0a77d30892e4ee95ed9bde (diff) | |
Merge branch 'master' of github.com:openscad/openscad
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ubuntu-build-dependencies.sh | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/scripts/ubuntu-build-dependencies.sh b/scripts/ubuntu-build-dependencies.sh index 0609172..1754e32 100755 --- a/scripts/ubuntu-build-dependencies.sh +++ b/scripts/ubuntu-build-dependencies.sh @@ -26,21 +26,8 @@ fi echo "tested on Ubuntu 12. If this fails try 'old linux' build (see README.md)" - -if [ "`dpkg --list | grep -i cgal`" ]; then - echo "Please make sure you have run apt-get purge on all cgal packages" - exit -fi - -if [ "`dpkg --list | grep -i opencsg`" ]; then - echo "Please make sure you have run apt-get purge on all opencsg packages" - exit -fi - sudo apt-get install build-essential libqt4-dev libqt4-opengl-dev \ libxmu-dev cmake bison flex libeigen2-dev git-core libboost-all-dev \ - libXi-dev libmpfr-dev libgmp-dev libboost-dev libglew1.6-dev + libXi-dev libmpfr-dev libgmp-dev libboost-dev libglew1.6-dev \ + libcgal-dev libopencsg-dev -echo "now copy/paste the following to install CGAL and OpenCSG from source:" -echo "sudo BASEDIR=/usr/local ./scripts/linux-build-dependencies.sh cgal-use-sys-libs" -echo "sudo BASEDIR=/usr/local ./scripts/linux-build-dependencies.sh opencsg" |