From f162389ff796b76c785dab14565af3c2cc0e7ac0 Mon Sep 17 00:00:00 2001 From: Flemming Richter Date: Wed, 22 Jul 2015 19:42:12 +0200 Subject: [PATCH 1/2] make it easier to build on Fedora --- simple_make.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/simple_make.sh b/simple_make.sh index 5c7017fec..a635baa84 100755 --- a/simple_make.sh +++ b/simple_make.sh @@ -16,11 +16,17 @@ elif which dnf; then "Development Tools" sudo dnf install \ git qt-devel qt-doc qt-creator qt5-qtsvg opencv-devel \ - openal-soft-devel libXScrnSaver-devel qrencode-devel + openal-soft-devel libXScrnSaver-devel qrencode-devel \ + opus-devel libvpx-devel qt5-qttools-devel glib2-devel \ + gdk-pixbuf2-devel gtk2-devel else echo "Unknown package manager, attempting to compile anyways" fi ./bootstrap.sh -qmake +if [ -e /etc/redhat-release ]; then + qmake-qt5 +else + qmake +fi make From 546d9c7b7aa75fce530cae6a296a7b513d9dfa4a Mon Sep 17 00:00:00 2001 From: Flemming Richter Date: Thu, 23 Jul 2015 23:01:21 +0200 Subject: [PATCH 2/2] fix indentation problem from last commit --- simple_make.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/simple_make.sh b/simple_make.sh index a635baa84..db9a0aeb3 100755 --- a/simple_make.sh +++ b/simple_make.sh @@ -17,16 +17,16 @@ elif which dnf; then sudo dnf install \ git qt-devel qt-doc qt-creator qt5-qtsvg opencv-devel \ openal-soft-devel libXScrnSaver-devel qrencode-devel \ - opus-devel libvpx-devel qt5-qttools-devel glib2-devel \ - gdk-pixbuf2-devel gtk2-devel + opus-devel libvpx-devel qt5-qttools-devel glib2-devel \ + gdk-pixbuf2-devel gtk2-devel else echo "Unknown package manager, attempting to compile anyways" fi ./bootstrap.sh if [ -e /etc/redhat-release ]; then - qmake-qt5 + qmake-qt5 else - qmake + qmake fi make