diff --git a/libraries/lib-builtin-effects/CMakeLists.txt b/libraries/lib-builtin-effects/CMakeLists.txt index 2ee16921e..377c4478a 100644 --- a/libraries/lib-builtin-effects/CMakeLists.txt +++ b/libraries/lib-builtin-effects/CMakeLists.txt @@ -94,7 +94,7 @@ set( LIBRARIES lib-dynamic-range-processor-interface lib-wave-track-fft-interface lib-label-track-interface - lib-note-track-interface + $<$:lib-note-track-interface> $<$:sbsms::sbsms> $<$:SoundTouch::SoundTouch> ) diff --git a/libraries/lib-builtin-effects/SoundTouchBase.cpp b/libraries/lib-builtin-effects/SoundTouchBase.cpp index 8bc7963df..9230b683e 100644 --- a/libraries/lib-builtin-effects/SoundTouchBase.cpp +++ b/libraries/lib-builtin-effects/SoundTouchBase.cpp @@ -24,9 +24,12 @@ effect that uses SoundTouch to do its processing (ChangeTempo #include "SyncLock.h" #include "WaveClip.h" #include "WaveTrack.h" -#include "NoteTrack.h" #include "TimeWarper.h" +#ifdef USE_MIDI +#include "NoteTrack.h" +#endif + // Soundtouch defines these as well, which are also in generated configmac.h // and configunix.h, so get rid of them before including, // to avoid compiler warnings, and be sure to do this diff --git a/libraries/lib-nyquist-effects/CMakeLists.txt b/libraries/lib-nyquist-effects/CMakeLists.txt index 0f32b50bb..9e7e3661f 100644 --- a/libraries/lib-nyquist-effects/CMakeLists.txt +++ b/libraries/lib-nyquist-effects/CMakeLists.txt @@ -11,11 +11,12 @@ set( SOURCES set( LIBRARIES lib-effects-interface lib-label-track-interface - lib-note-track-interface + $<$:lib-note-track-interface> lib-time-track-interface lib-wave-track-settings nyquist ) + tenacity_library( lib-nyquist-effects "${SOURCES}" "${LIBRARIES}" "" "" ) diff --git a/libraries/lib-nyquist-effects/NyquistBase.cpp b/libraries/lib-nyquist-effects/NyquistBase.cpp index f1036fcd8..ae5cc8a0d 100644 --- a/libraries/lib-nyquist-effects/NyquistBase.cpp +++ b/libraries/lib-nyquist-effects/NyquistBase.cpp @@ -14,7 +14,6 @@ #include "FileNames.h" #include "LabelTrack.h" #include "Languages.h" -#include "NoteTrack.h" #include "PlatformCompatibility.h" #include "PluginManager.h" #include "Prefs.h" @@ -32,6 +31,10 @@ #include "WaveTrack.h" #include "wxFileNameWrapper.h" +#ifdef USE_MIDI +#include "NoteTrack.h" +#endif + #include "nyquist/xlisp/xlisp.h" #include "nyx.h"