Skip to content

Commit 784bfed

Browse files
committed
docs: Fix installation scripts
Mac OSX users should use package managers to install libusb and glfw3. cl.hpp no longer needs downloading. Fix install_ubuntu.sh to download debs properly for ARM users.
1 parent b73776f commit 784bfed

File tree

2 files changed

+9
-23
lines changed

2 files changed

+9
-23
lines changed

depends/install_mac.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

depends/install_ubuntu.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
#!/bin/sh
22

33
cd `dirname $0`
4-
DEPENDS_DIR=`pwd`
5-
6-
ARCH="$(uname -m | grep -q 64 && echo 'amd64' || echo 'i386')"
4+
ARCH=`/usr/bin/dpkg --print-architecture`
75

86
# download standalone packages for 14.04 LTS
9-
wget -N http://archive.ubuntu.com/ubuntu/pool/universe/g/glfw3/libglfw3_3.0.4-1_${ARCH}.deb
10-
wget -N http://archive.ubuntu.com/ubuntu/pool/universe/g/glfw3/libglfw3-dev_3.0.4-1_${ARCH}.deb
11-
12-
sh ./install_libusb.sh
7+
if [ "$ARCH" = amd64 -o "$ARCH" = i386 ]; then
8+
REPO=http://archive.ubuntu.com/ubuntu
9+
else
10+
REPO=http://ports.ubuntu.com/ubuntu-ports
11+
fi
12+
wget -N $REPO/pool/universe/g/glfw3/libglfw3_3.0.4-1_${ARCH}.deb
13+
wget -N $REPO/pool/universe/g/glfw3/libglfw3-dev_3.0.4-1_${ARCH}.deb
1314

1415
cat <<-EOT
1516
1617
Execute the following commands to install the remaining dependencies (if you have not already done so):
1718
1819
sudo dpkg -i libglfw3*_3.0.4-1_*.deb
19-
sudo apt-get install build-essential libturbojpeg libjpeg-turbo8-dev libtool autoconf libudev-dev cmake mesa-common-dev freeglut3-dev libxrandr-dev doxygen libxi-dev libopencv-dev automake
20+
sudo apt-get install build-essential cmake pkg-config libturbojpeg libjpeg-turbo8-dev mesa-common-dev freeglut3-dev libxrandr-dev libxi-dev
2021
sudo apt-get install libturbojpeg0-dev # (Debian)
2122
2223
EOT

0 commit comments

Comments
 (0)