From a3f2800c55ac560216372971befe935e749a504f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20Panzenb=C3=B6ck?= Date: Mon, 20 Jan 2014 18:04:04 +0100 Subject: [PATCH] make compile under Fedora 20 --- src/config | 7 +------ src/qjoypad.pro | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/config b/src/config index b2c4638..3e6b549 100755 --- a/src/config +++ b/src/config @@ -11,11 +11,6 @@ if( ! pkg-config --atleast-version=4.2 QtCore ); then exit 1; fi; -if ( ! qmake ); then - echo "Error: you need qmake!"; - exit 1; -fi; - if( ! ( qmake --version | grep -qi 'Qt version 4' ) ); then echo "WARNING: Falling back on qmake-qt4; this may or may not work"; echo "WARNING: if it fails please see the compilation instructions on @@ -24,7 +19,7 @@ if( ! ( qmake --version | grep -qi 'Qt version 4' ) ); then else QMAKE_EXEC="qmake"; fi; - + devdir="/dev/input" prefix="/usr/local" diff --git a/src/qjoypad.pro b/src/qjoypad.pro index 7b5b7a4..3c20ba0 100644 --- a/src/qjoypad.pro +++ b/src/qjoypad.pro @@ -31,7 +31,7 @@ DEFINES += ICON64='\\\"$${icons.conf_path}/icon64.png\\\"' TEMPLATE = app INCLUDEPATH += . -QMAKE_LIBS += -lXtst +QMAKE_LIBS += -lXtst -lX11 # Input HEADERS += axis.h \