From 7a4f1cb98fa2aaa392c4cae1eb66e21ae3394630 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 13 Mar 2015 13:31:48 +0100 Subject: [PATCH] only jack+windows use portaudio. fixes missing lib if portaudio-backend is used on on non-windows platforms (pkg-config defines HAVE_PORTAUDIO) --- libs/backends/jack/jack_utils.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/backends/jack/jack_utils.cc b/libs/backends/jack/jack_utils.cc index 981c0d4b86..727ff90bc8 100644 --- a/libs/backends/jack/jack_utils.cc +++ b/libs/backends/jack/jack_utils.cc @@ -34,7 +34,7 @@ #include // 'IShellLink' #endif -#ifdef HAVE_PORTAUDIO +#if (defined PLATFORM_WINDOWS && defined HAVE_PORTAUDIO) #include #endif @@ -373,7 +373,7 @@ ARDOUR::get_jack_coreaudio_device_names (device_map_t& devices) void ARDOUR::get_jack_portaudio_device_names (device_map_t& devices) { -#ifdef HAVE_PORTAUDIO +#if (defined PLATFORM_WINDOWS && defined HAVE_PORTAUDIO) if (Pa_Initialize() != paNoError) { return; } @@ -947,7 +947,7 @@ ARDOUR::enumerate_midi_options () midi_options.push_back (make_pair (_("ALSA (JACK1, 0.124 and later)"), alsa_seq_midi_driver_name)); midi_options.push_back (make_pair (_("ALSA (JACK2, 1.9.8 and later)"), alsa_raw_midi_driver_name)); #endif -#ifdef HAVE_PORTAUDIO +#if (defined PLATFORM_WINDOWS && defined HAVE_PORTAUDIO) /* Windows folks: what name makes sense here? Are there other choices as well ? */