diff --git a/wfview.pro b/wfview.pro index 7e0ce9b..8cc26cd 100644 --- a/wfview.pro +++ b/wfview.pro @@ -147,12 +147,18 @@ CONFIG(debug, release|debug) { QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\qcustomplot\x64\qcustomplotd2.dll debug\$$escape_expand(\n\t)) QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll debug\$$escape_expand(\n\t)) win32:LIBS += -L../portaudio/msvc/X64/Debug/ -lportaudio_x64 + contains(DEFINES,USB_CONTROLLER){ + win32:LIBS += -L../hidapi/windows/x64/debug -lhidapi + } } else { LIBS += -L../opus/win32/VS2015/win32/Debug/ LIBS += -L../qcustomplot/win32 QMAKE_POST_LINK +=$$quote(cmd /c copy /y .\qcustomplot\win32\qcustomplotd2.dll debug\$$escape_expand(\n\t)) QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\win32\Debug\portaudio_x86.dll debug\$$escape_expand(\n\t)) win32:LIBS += -L../portaudio/msvc/Win32/Debug/ -lportaudio_x86 -lole32 + contains(DEFINES,USB_CONTROLLER){ + win32:LIBS += -L../hidapi/windows/debug -lhidapi + } } } } else { @@ -165,12 +171,18 @@ CONFIG(debug, release|debug) { QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\qcustomplot\x64\qcustomplot2.dll release\$$escape_expand(\n\t)) QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\x64\Release\portaudio_x64.dll release\$$escape_expand(\n\t)) win32:LIBS += -L../portaudio/msvc/X64/Release/ -lportaudio_x64 + contains(DEFINES,USB_CONTROLLER){ + win32:LIBS += -L../hidapi/windows/x64/release -lhidapi + } } else { LIBS += -L../opus/win32/VS2015/win32/Release/ LIBS += -L../qcustomplot/win32 QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\qcustomplot\win32\qcustomplot2.dll release\$$escape_expand(\n\t)) QMAKE_POST_LINK +=$$quote(cmd /c copy /y ..\portaudio\msvc\win32\Release\portaudio_x86.dll release\$$escape_expand(\n\t)) win32:LIBS += -L../portaudio/msvc/Win32/Release/ -lportaudio_x86 -lole32 + contains(DEFINES,USB_CONTROLLER){ + win32:LIBS += -L../hidapi/windows/release -lhidapi + } } } } @@ -178,7 +190,6 @@ CONFIG(debug, release|debug) { contains(DEFINES,USB_CONTROLLER){ linux:LIBS += -L./ -l$$QCPLIB -lhidapi-libusb macx:LIBS += -lhidapi - win32:LIBS += -L../hidapi/windows/x64/release -lhidapi win32:INCLUDEPATH += ../hidapi/hidapi }