eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

some more merge fixes

Browse source
This commit is contained in:
Volker Fischer 2020-06-17 19:34:51 +02:00
parent a2a489e6f0
commit 30d8181423
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Jamulus.pro
View file

@ -13,10 +13,10 @@ CONFIG += qt \
QT += network \ QT += network \
xml xml
!contains(CONFIG, "headless") { contains(CONFIG, "headless") {
QT += widgets
} else {
QT -= gui QT -= gui
} else {
QT += widgets
} }
TRANSLATIONS = src/res/translation/translation_de_DE.ts \ TRANSLATIONS = src/res/translation/translation_de_DE.ts \
@ -992,12 +992,12 @@ DISTFILES_OPUS += libs/opus/AUTHORS \
libs/opus/celt/arm/armopts.s.in \ libs/opus/celt/arm/armopts.s.in \
libs/opus/celt/arm/celt_pitch_xcorr_arm.s \ libs/opus/celt/arm/celt_pitch_xcorr_arm.s \
!contains(CONFIG, "headless") { contains(CONFIG, "headless") {
DEFINES += HEADLESS
} else {
HEADERS += $$HEADERS_GUI HEADERS += $$HEADERS_GUI
SOURCES += $$SOURCES_GUI SOURCES += $$SOURCES_GUI
FORMS += $$FORMS_GUI FORMS += $$FORMS_GUI
} else {
DEFINES += HEADLESS
} }
# use external OPUS library if requested # use external OPUS library if requested

1
src/main.cpp
View file

@ -662,6 +662,7 @@ int main ( int argc, char** argv )
bDisconnectAllClientsOnQuit, bDisconnectAllClientsOnQuit,
bUseDoubleSystemFrameSize, bUseDoubleSystemFrameSize,
eLicenceType ); eLicenceType );
#ifndef HEADLESS #ifndef HEADLESS
if ( bUseGUI ) if ( bUseGUI )
{ {

4
src/soundbase.cpp
View file

@ -22,10 +22,6 @@
* *
\******************************************************************************/ \******************************************************************************/
#ifndef HEADLESS
# include <QMessageBox>
#endif
#include "soundbase.h" #include "soundbase.h"

3
src/soundbase.h
View file

@ -26,6 +26,9 @@
#include <QThread> #include <QThread>
#include <QString> #include <QString>
#ifndef HEADLESS
# include <QMessageBox>
#endif
#include "global.h" #include "global.h"
#include "util.h" #include "util.h"