From bdf82eb2d7fc77788bf10e4bdedd4e89221fc3d7 Mon Sep 17 00:00:00 2001 From: Kreeblah Date: Thu, 2 Apr 2020 16:49:27 -0700 Subject: [PATCH] Fix macOS compilation Note that this does introduce pkg-config as a compile-time dependency. --- TL866_Updater/QT/TL866_Updater.pro | 8 +++++--- TL866_Updater/QT/usb_macos.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/TL866_Updater/QT/TL866_Updater.pro b/TL866_Updater/QT/TL866_Updater.pro index d1d81ce..5ce205c 100644 --- a/TL866_Updater/QT/TL866_Updater.pro +++ b/TL866_Updater/QT/TL866_Updater.pro @@ -40,11 +40,13 @@ HEADERS += usb_macos.h \ notifier_macos.h SOURCES += usb_macos.cpp \ notifier_macos.cpp -LIBS += -L/opt/local/lib \ - -lusb-1.0 \ +LIBS += `pkg-config --libs-only-l libusb-1.0` \ -framework IOKit \ -framework Carbon -QMAKE_CXXFLAGS += "-std=c++0x" +QMAKE_CXX = clang +QMAKE_CXXFLAGS += "-std=c++0x" \ + `pkg-config --cflags libusb-1.0` +QMAKE_LFLAGS += `pkg-config --libs-only-L libusb-1.0` INCPATH += /opt/local/include } diff --git a/TL866_Updater/QT/usb_macos.h b/TL866_Updater/QT/usb_macos.h index 4402f16..67c637c 100644 --- a/TL866_Updater/QT/usb_macos.h +++ b/TL866_Updater/QT/usb_macos.h @@ -3,7 +3,7 @@ #include #include -#include +#include class USB {