mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-09 23:34:20 +00:00
JACK: Fix build failure on Linux when JUCE_JACK=1
This commit is contained in:
parent
de9c29f8e7
commit
a99bff1e1d
24 changed files with 26 additions and 40 deletions
|
|
@ -379,7 +379,7 @@ add_library( ${BINARY_NAME}
|
|||
"../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp"
|
||||
|
|
@ -3065,7 +3065,7 @@ set_source_files_properties(
|
|||
"../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp"
|
||||
|
|
|
|||
|
|
@ -579,7 +579,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -1270,7 +1270,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -579,7 +579,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -1270,7 +1270,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -334,7 +334,7 @@ add_library( ${BINARY_NAME}
|
|||
"../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp"
|
||||
|
|
@ -2634,7 +2634,7 @@ set_source_files_properties(
|
|||
"../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp"
|
||||
|
|
|
|||
|
|
@ -537,7 +537,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -1051,7 +1051,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -367,7 +367,7 @@ add_library( ${BINARY_NAME}
|
|||
"../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp"
|
||||
|
|
@ -2820,7 +2820,7 @@ set_source_files_properties(
|
|||
"../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp"
|
||||
|
|
|
|||
|
|
@ -545,7 +545,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -1126,7 +1126,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -545,7 +545,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -1126,7 +1126,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -338,7 +338,7 @@ add_library( ${BINARY_NAME}
|
|||
"../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp"
|
||||
|
|
@ -2718,7 +2718,7 @@ set_source_files_properties(
|
|||
"../../../../../modules/juce_audio_devices/native/juce_CoreMidi_mac.mm"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_DirectSound_windows.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_HighPerformanceAudioHelpers_android.h"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_JackAudio.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_android.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_linux.cpp"
|
||||
"../../../../../modules/juce_audio_devices/native/juce_Midi_windows.cpp"
|
||||
|
|
|
|||
|
|
@ -537,7 +537,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -1081,7 +1081,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -553,7 +553,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -1174,7 +1174,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -553,7 +553,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -1174,7 +1174,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -536,7 +536,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<ExcludedFromBuild>true</ExcludedFromBuild>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -1078,7 +1078,7 @@
|
|||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_DirectSound_windows.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio_linux.cpp">
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_JackAudio.cpp">
|
||||
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\..\modules\juce_audio_devices\native\juce_Midi_android.cpp">
|
||||
|
|
|
|||
|
|
@ -176,20 +176,6 @@
|
|||
#include "native/juce_ALSA_weak_linux.h"
|
||||
#include "native/juce_ALSA_linux.cpp"
|
||||
#endif
|
||||
|
||||
#if JUCE_JACK
|
||||
/* Got an include error here? If so, you've either not got jack-audio-connection-kit
|
||||
installed, or you've not got your paths set up correctly to find its header files.
|
||||
|
||||
The package you need to install to get JACK support is "libjack-dev".
|
||||
|
||||
If you don't have the jack-audio-connection-kit library and don't want to build
|
||||
JUCE with low latency audio support, just set the JUCE_JACK flag to 0.
|
||||
*/
|
||||
#include <jack/jack.h>
|
||||
#include "native/juce_JackAudio_linux.cpp"
|
||||
#endif
|
||||
|
||||
#undef SIZEOF
|
||||
|
||||
//==============================================================================
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue