From 6e595bf9d9b33d276fe5cffca6286e424f3a9183 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 20 Nov 2019 22:13:01 +0000 Subject: [PATCH] Dont give warnings for missing libs on CI test builds Signed-off-by: falkTX --- .travis/script-macos.sh | 2 +- .travis/script-win32.sh | 2 +- .travis/script-win64.sh | 2 +- source/includes/CarlaNativePrograms.hpp | 3 ++- source/native-plugins/audio-file.cpp | 4 +++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis/script-macos.sh b/.travis/script-macos.sh index 7402dd24d..483a07ed9 100755 --- a/.travis/script-macos.sh +++ b/.travis/script-macos.sh @@ -3,7 +3,7 @@ set -e # Preparation -_FLAGS="-Wno-attributes -Wno-deprecated-declarations -Werror" +_FLAGS="-Wno-attributes -Wno-deprecated-declarations -Werror -DBUILDING_FOR_CI" export CFLAGS="${_FLAGS}" export CXXFLAGS="${_FLAGS}" export MACOS_OLD=true diff --git a/.travis/script-win32.sh b/.travis/script-win32.sh index 3ed78d327..392742cfa 100755 --- a/.travis/script-win32.sh +++ b/.travis/script-win32.sh @@ -3,7 +3,7 @@ set -e # Preparation -_FLAGS="-DFLUIDSYNTH_NOT_A_DLL -DPTW32_STATIC_LIB -Werror" +_FLAGS="-DFLUIDSYNTH_NOT_A_DLL -DPTW32_STATIC_LIB -Werror -DBUILDING_FOR_CI" _PREFIX=i686-w64-mingw32 export AR=${_PREFIX}-ar export CC=${_PREFIX}-gcc diff --git a/.travis/script-win64.sh b/.travis/script-win64.sh index 1058f4ab2..543cff9c4 100755 --- a/.travis/script-win64.sh +++ b/.travis/script-win64.sh @@ -3,7 +3,7 @@ set -e # Preparation -_FLAGS="-DFLUIDSYNTH_NOT_A_DLL -DPTW32_STATIC_LIB -Werror" +_FLAGS="-DFLUIDSYNTH_NOT_A_DLL -DPTW32_STATIC_LIB -Werror -DBUILDING_FOR_CI" _PREFIX=x86_64-w64-mingw32 export AR=${_PREFIX}-ar export CC=${_PREFIX}-gcc diff --git a/source/includes/CarlaNativePrograms.hpp b/source/includes/CarlaNativePrograms.hpp index 05e349b39..49ab87b10 100644 --- a/source/includes/CarlaNativePrograms.hpp +++ b/source/includes/CarlaNativePrograms.hpp @@ -83,7 +83,8 @@ template class NativePluginWithMidiPrograms : public NativePluginClass { public: - typedef SharedResourcePointer> NativeMidiPrograms; + typedef NativePluginPresetManager NativePluginPresetManagerType; + typedef SharedResourcePointer NativeMidiPrograms; NativePluginWithMidiPrograms(const NativeHostDescriptor* const host, const NativeMidiPrograms& programs, diff --git a/source/native-plugins/audio-file.cpp b/source/native-plugins/audio-file.cpp index a1b56b369..e558089e3 100644 --- a/source/native-plugins/audio-file.cpp +++ b/source/native-plugins/audio-file.cpp @@ -32,8 +32,10 @@ static const char* const audiofilesWildcard = # endif #endif #if !defined(HAVE_SNDFILE) && !defined(HAVE_FFMPEG) -# warning sndfile and ffmpeg libraries missing, no audio file support will be available "" +# ifndef BUILDING_FOR_CI +# warning sndfile and ffmpeg libraries missing, no audio file support will be available +# endif #endif ;