From a7f1b0c7d80da4ec83d47a49e977a1445266bf9a Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sun, 3 May 2020 19:12:46 +0200 Subject: [PATCH] fixes for raspijamulus.sh script --- Jamulus.pro | 10 ++++++++-- distributions/raspijamulus.sh | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Jamulus.pro b/Jamulus.pro index 1b73e91e..a83033ee 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -145,8 +145,14 @@ win32 { nosoundoption = $$find(CONFIG, "nosound") count(nosoundoption, 0) { message(Jack Audio Interface Enabled.) - CONFIG += link_pkgconfig - PKGCONFIG += jack + + contains(CONFIG, "raspijamulus") { + message(Using Jack Audio in raspijamulus.sh mode.) + LIBS += -ljack + } else { + CONFIG += link_pkgconfig + PKGCONFIG += jack + } HEADERS += linux/sound.h SOURCES += linux/sound.cpp diff --git a/distributions/raspijamulus.sh b/distributions/raspijamulus.sh index 71a99121..4a3d3e06 100755 --- a/distributions/raspijamulus.sh +++ b/distributions/raspijamulus.sh @@ -75,7 +75,7 @@ fi # compile Jamulus with external Opus library cd .. -qmake "CONFIG+=opus_shared_lib" "INCLUDEPATH+=distributions/${OPUS}/include" "QMAKE_LIBDIR+=distributions/${OPUS}/.libs" "INCLUDEPATH+=distributions/jack2/common" "QMAKE_LIBDIR+=distributions/jack2/build/common" Jamulus.pro +qmake "CONFIG+=opus_shared_lib" "CONFIG+=raspijamulus" "INCLUDEPATH+=distributions/${OPUS}/include" "QMAKE_LIBDIR+=distributions/${OPUS}/.libs" "INCLUDEPATH+=distributions/jack2/common" "QMAKE_LIBDIR+=distributions/jack2/build/common" Jamulus.pro make -j${NCORES} # get first USB audio sound card device