diff --git a/.travis/script-linux-juce-strict.sh b/.travis/script-linux-juce-strict.sh index 9f2072304..bdb7ee44c 100755 --- a/.travis/script-linux-juce-strict.sh +++ b/.travis/script-linux-juce-strict.sh @@ -17,7 +17,7 @@ make distclean >/dev/null make USING_JUCE=true features # Build things that we skip strict tests for -make USING_JUCE=true 3rd frontend +make USING_JUCE=true 3rd frontend plugin-wine make USING_JUCE=true -C source/modules/juce_audio_basics posix32 make USING_JUCE=true -C source/modules/juce_audio_devices posix32 make USING_JUCE=true -C source/modules/juce_audio_processors posix32 diff --git a/.travis/script-linux-strict.sh b/.travis/script-linux-strict.sh index 8cad7b3c7..f265c27d8 100755 --- a/.travis/script-linux-strict.sh +++ b/.travis/script-linux-strict.sh @@ -17,7 +17,7 @@ make distclean >/dev/null make USING_JUCE=false features # Build things that we skip strict tests for -make USING_JUCE=false 3rd frontend +make USING_JUCE=false 3rd frontend plugin-wine make USING_JUCE=false -C source/modules/water posix32 # Build native stuff diff --git a/source/plugin/carla-lv2.cpp b/source/plugin/carla-lv2.cpp index 8e258b190..eb262f503 100644 --- a/source/plugin/carla-lv2.cpp +++ b/source/plugin/carla-lv2.cpp @@ -23,7 +23,7 @@ #include "CarlaPipeUtils.hpp" #include "CarlaString.hpp" -#ifdef USING_JUCE +#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN)) # if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wconversion" @@ -69,7 +69,7 @@ public: #endif kIgnoreParameters(std::strncmp(desc->label, "carla", 5) == 0), fMidiEventCount(0), -#ifdef USING_JUCE +#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN)) fJuceInitialiser(), #endif fLoadedFile(), @@ -855,7 +855,7 @@ private: uint32_t fMidiEventCount; NativeMidiEvent fMidiEvents[kMaxMidiEvents]; -#ifdef USING_JUCE +#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN)) juce::SharedResourcePointer fJuceInitialiser; #endif diff --git a/source/plugin/carla-vst.cpp b/source/plugin/carla-vst.cpp index b394a0bf8..267fb2c71 100644 --- a/source/plugin/carla-vst.cpp +++ b/source/plugin/carla-vst.cpp @@ -42,7 +42,7 @@ #include "CarlaMathUtils.hpp" #include "CarlaVstUtils.hpp" -#ifdef USING_JUCE +#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN)) # if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wconversion" @@ -98,7 +98,7 @@ public: fUiLauncher(nullptr), fHostType(kHostTypeNull), fMidiOutEvents(), -#ifdef USING_JUCE +#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN)) fJuceInitialiser(), #endif fStateChunk(nullptr) @@ -865,7 +865,7 @@ private: CARLA_DECLARE_NON_COPY_STRUCT(FixedVstEvents); } fMidiOutEvents; -#ifdef USING_JUCE +#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN)) juce::SharedResourcePointer fJuceInitialiser; #endif