diff --git a/Jamulus.pro b/Jamulus.pro index e69a4a80..17bbfd14 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -56,6 +56,26 @@ win32 { -framework CoreAudio \ -framework AudioToolbox \ -framework AudioUnit + + # replace coreaudio with jack if requested + contains(CONFIG, "jackonmac") { + message(Using Jack instead of CoreAudio.) + + !exists(/usr/include/jack/jack.h) { + !exists(/usr/local/include/jack/jack.h) { + message(Warning: jack.h was not found at the usual place, maybe jack is not installed) + } + } + + HEADERS -= mac/sound.h + SOURCES -= mac/sound.cpp + HEADERS += linux/sound.h + SOURCES += linux/sound.cpp + DEFINES += WITH_SOUND + DEFINES += JACK_REPLACES_COREAUDIO + INCLUDEPATH += /usr/local/include + LIBS += /usr/local/lib/libjack.dylib + } } else:android { HEADERS += android/sound.h SOURCES += android/sound.cpp diff --git a/src/client.h b/src/client.h index 4332ced5..13f58e5f 100755 --- a/src/client.h +++ b/src/client.h @@ -46,7 +46,7 @@ # ifdef _WIN32 # include "../windows/sound.h" # else -# if defined ( __APPLE__ ) || defined ( __MACOSX ) +# if ( defined ( __APPLE__ ) || defined ( __MACOSX ) ) && !defined ( JACK_REPLACES_COREAUDIO ) # include "../mac/sound.h" # else # ifdef ANDROID