From d57509aea9bc2e7f17044622046148261e295df5 Mon Sep 17 00:00:00 2001 From: owen Date: Tue, 13 Jan 2015 22:22:08 -0800 Subject: [PATCH 1/2] fix linux compile --- build/install-deps-linux.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/build/install-deps-linux.sh b/build/install-deps-linux.sh index 2732ff78f4..691f9f5132 100755 --- a/build/install-deps-linux.sh +++ b/build/install-deps-linux.sh @@ -8,20 +8,23 @@ if [ ! $(command -v apt-get) ]; then exit 0 fi +#install g++-4.9 +sudo add-apt-repository ppa:ubuntu-toolchain-r/test +sudo apt-get update + DEPENDS='libx11-dev' DEPENDS+=' libxmu-dev' DEPENDS+=' libglu1-mesa-dev' DEPENDS+=' libgl2ps-dev' DEPENDS+=' libxi-dev' -DEPENDS+=' g++' +DEPENDS+=' g++-4.9' DEPENDS+=' libzip-dev' DEPENDS+=' libpng12-dev' DEPENDS+=' libcurl4-gnutls-dev' DEPENDS+=' libfontconfig1-dev' DEPENDS+=' libsqlite3-dev' -DEPENDS+=' libglew*-dev' +DEPENDS+=' libglew-dev' DEPENDS+=' libssl-dev' -DEPENDS+=' gnutls-dev' MISSING= echo "Checking for missing packages ..." @@ -31,6 +34,13 @@ for i in $DEPENDS; do fi done + +if [ -f /usr/bin/g++ ];then +sudo rm /usr/bin/g++ +echo "remove old g++" +fi +sudo ln -s /usr/bin/g++-4.9 /usr/bin/g++ + if [ -n "$MISSING" ]; then TXTCOLOR_DEFAULT="\033[0;m" TXTCOLOR_GREEN="\033[0;32m" From b44f422f4d78a5ce5da66419bf24029522d0388e Mon Sep 17 00:00:00 2001 From: andyque Date: Wed, 14 Jan 2015 14:43:01 +0800 Subject: [PATCH 2/2] remove glfw2 --- build/install-deps-linux.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/install-deps-linux.sh b/build/install-deps-linux.sh index 691f9f5132..b58b8ca923 100755 --- a/build/install-deps-linux.sh +++ b/build/install-deps-linux.sh @@ -12,6 +12,9 @@ fi sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update +#try to remove glfw2 +sudo apt-get remove libglfw2 + DEPENDS='libx11-dev' DEPENDS+=' libxmu-dev' DEPENDS+=' libglu1-mesa-dev'