From 8f5016a2f4e377eb7a7488f5bc49870b0526cb56 Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Fri, 13 Jan 2023 10:44:11 +0000
Subject: [PATCH] Fix problem if USB_CONTROLLER isn't enabled

---
 usbcontroller.h | 2 ++
 wfview.pro      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/usbcontroller.h b/usbcontroller.h
index 84c21fa..54dff57 100644
--- a/usbcontroller.h
+++ b/usbcontroller.h
@@ -15,11 +15,13 @@
 #include <QGamepad>
 #endif
 
+#if defined(USB_CONTROLLER)
 #ifndef Q_OS_WIN
 #include "hidapi/hidapi.h"
 #else
 #include "hidapi.h"
 #endif
+#endif
 
 #ifndef Q_OS_WIN
 //Headers needed for sleeping.
diff --git a/wfview.pro b/wfview.pro
index fc5d5ec..f3ee704 100644
--- a/wfview.pro
+++ b/wfview.pro
@@ -14,7 +14,7 @@ QT       += core gui serialport network multimedia xml
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
 
-contains(DEFINES,USB_CONTROLLER){
+contains(DEFINES,USB_CONTROLLERS){
     lessThan(QT_MAJOR_VERSION, 6): QT += gamepad
 }
 
@@ -175,7 +175,7 @@ linux:LIBS += -L./ -l$$QCPLIB -lopus
 !linux:LIBS += -l$$QCPLIB -lopus
 macx:LIBS += -framework CoreAudio -framework CoreFoundation -lpthread -lopus 
 
-contains(DEFINES,USB_CONTROLLER){
+contains(DEFINES,USB_CONTROLLERS){
     linux:LIBS += -L./ -l$$QCPLIB -lhidapi-libusb
     macx:LIBS += -framework CoreAudio -framework CoreFoundation -lhidapi
     win32:INCLUDEPATH += ../hidapi/hidapi