Fixes for linux build

merge-requests/5/head
M0VSE 2021-05-23 23:04:35 +01:00
rodzic 9c29732376
commit 6c47e2fa5a
3 zmienionych plików z 11 dodań i 13 usunięć

Wyświetl plik

@ -810,8 +810,6 @@ private:
void reinit();
quint16 getBuffer(int);
std::mutex mutex;
bool isInitialized;
RtAudio audio;
int audioDevice = 0;

Wyświetl plik

@ -26,7 +26,7 @@
#include "qledlabel.h"
#include "rigctld.h"
#include <../qcustomplot/qcustomplot.h>
#include <qcustomplot.h>
#include <qserialportinfo.h>
namespace Ui {

Wyświetl plik

@ -41,14 +41,14 @@ linux:DEFINES += __LINUX_ALSA__
#linux:DEFINES += __LINUX_PULSE__
macx:DEFINES += __MACOSX_CORE__
option(RTAUDIO_API_DS "Build DirectSound API" OFF)
option(RTAUDIO_API_ASIO "Build ASIO API" OFF)
option(RTAUDIO_API_WASAPI "Build WASAPI API" ${WIN32})
option(RTAUDIO_API_OSS "Build OSS4 API" ${xBSD})
option(RTAUDIO_API_ALSA "Build ALSA API" ${LINUX})
option(RTAUDIO_API_PULSE "Build PulseAudio API" ${pulse_FOUND})
option(RTAUDIO_API_JACK "Build JACK audio server API" ${HAVE_JACK})
option(RTAUDIO_API_CORE "Build CoreAudio API" ${APPLE})
#option(RTAUDIO_API_DS "Build DirectSound API" OFF)
#option(RTAUDIO_API_ASIO "Build ASIO API" OFF)
#option(RTAUDIO_API_WASAPI "Build WASAPI API" ${WIN32})
#option(RTAUDIO_API_OSS "Build OSS4 API" ${xBSD})
#option(RTAUDIO_API_ALSA "Build ALSA API" ${LINUX})
#option(RTAUDIO_API_PULSE "Build PulseAudio API" ${pulse_FOUND})
#option(RTAUDIO_API_JACK "Build JACK audio server API" ${HAVE_JACK})
#option(RTAUDIO_API_CORE "Build CoreAudio API" ${APPLE})
macx:INCLUDEPATH += /usr/local/include /opt/local/include
macx:LIBS += -L/usr/local/lib -L/opt/local/lib
@ -121,7 +121,7 @@ SOURCES += main.cpp\
resampler/resample.c \
repeatersetup.cpp \
rigctld.cpp \
rtaudio/RTAudio.cpp
rtaudio/RtAudio.cpp
HEADERS += wfmain.h \
commhandler.h \
@ -145,7 +145,7 @@ HEADERS += wfmain.h \
repeatersetup.h \
repeaterattributes.h \
rigctld.h \
rtaudio/RTAudio.h
rtaudio/RtAudio.h
FORMS += wfmain.ui \