From 460641972ad536b509328a02375476928fac11f3 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Thu, 12 Jan 2023 20:16:23 +0000
Subject: [PATCH] Neaten wfview.pro

---
 wfview.pro | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/wfview.pro b/wfview.pro
index 972b16d..8dddb59 100644
--- a/wfview.pro
+++ b/wfview.pro
@@ -9,8 +9,15 @@ QT       += core gui serialport network multimedia xml
 #QT += sql
 #DEFINES += USESQL
 
+#Uncomment The following line to enable USB controllers (Shuttle/RC-28 etc.)
+#DEFINES += USB_CONTROLLERS
+
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
 
+contains(DEFINES,USB_CONTROLLER){
+    lessThan(QT_MAJOR_VERSION, 6): QT += gamepad
+}
+
 TARGET = wfview
 TEMPLATE = app
 
@@ -18,14 +25,6 @@ DEFINES += WFVIEW_VERSION=\\\"1.56\\\"
 
 DEFINES += BUILD_WFVIEW
 
-#Uncomment The following 6 lines to enable USB controllers (Shuttle/RC-28 etc.)
-#DEFINES += USB_CONTROLLERS
-#linux:LIBS += -L./ -l$$QCPLIB -lhidapi-libusb
-#macx:LIBS += -framework CoreAudio -framework CoreFoundation -lhidapi
-#win32:INCLUDEPATH += ../hidapi/hidapi
-#win32:SOURCES += ../hidapi/windows/hid.c
-#QT += gamepad
-
 CONFIG(debug, release|debug) {
     # For Debug builds only:
     QMAKE_CXXFLAGS += -faligned-new
@@ -176,6 +175,13 @@ linux:LIBS += -L./ -l$$QCPLIB -lopus
 !linux:LIBS += -l$$QCPLIB -lopus
 macx:LIBS += -framework CoreAudio -framework CoreFoundation -lpthread -lopus 
 
+contains(DEFINES,USB_CONTROLLER){
+    linux:LIBS += -L./ -l$$QCPLIB -lhidapi-libusb
+    macx:LIBS += -framework CoreAudio -framework CoreFoundation -lhidapi
+    win32:INCLUDEPATH += ../hidapi/hidapi
+    win32:SOURCES += ../hidapi/windows/hid.c
+}
+
 !linux:INCLUDEPATH += ../qcustomplot
 !linux:INCLUDEPATH += ../opus/include