diff --git a/source/modules/zita-resampler/resampler-table.cc b/source/modules/zita-resampler/resampler-table.cc index c41b99b12..8a83a23e0 100644 --- a/source/modules/zita-resampler/resampler-table.cc +++ b/source/modules/zita-resampler/resampler-table.cc @@ -26,7 +26,7 @@ #undef ENABLE_VEC4 -#if defined(__SSE2_MATH__) || defined(__ARM_NEON) || defined(__ARM_NEON__) +#if (defined(__SSE2_MATH__) || defined(__ARM_NEON) || defined(__ARM_NEON__)) && !defined(CARLA_OS_WIN) # define ENABLE_VEC4 #endif diff --git a/source/modules/zita-resampler/resampler.cc b/source/modules/zita-resampler/resampler.cc index d966d2609..c531e2283 100644 --- a/source/modules/zita-resampler/resampler.cc +++ b/source/modules/zita-resampler/resampler.cc @@ -23,17 +23,19 @@ #include #include +#include "resampler.h" + #undef ENABLE_VEC4 -#if defined(__SSE2_MATH__) -# define ENABLE_VEC4 -# include -#elif defined(__ARM_NEON) || defined(__ARM_NEON__) -# define ENABLE_VEC4 -# include +#ifndef CARLA_OS_WIN +# if defined(__SSE2_MATH__) +# define ENABLE_VEC4 +# include +# elif defined(__ARM_NEON) || defined(__ARM_NEON__) +# define ENABLE_VEC4 +# include +# endif #endif -#include "resampler.h" - static unsigned int gcd (unsigned int a, unsigned int b) { diff --git a/source/modules/zita-resampler/vresampler.cc b/source/modules/zita-resampler/vresampler.cc index b39887da5..7ea4614b4 100644 --- a/source/modules/zita-resampler/vresampler.cc +++ b/source/modules/zita-resampler/vresampler.cc @@ -23,17 +23,19 @@ #include #include +#include "vresampler.h" + #undef ENABLE_VEC4 -#if defined(__SSE2_MATH__) -# define ENABLE_VEC4 -# include -#elif defined(__ARM_NEON) || defined(__ARM_NEON__) -# define ENABLE_VEC4 -# include +#ifndef CARLA_OS_WIN +# if defined(__SSE2_MATH__) +# define ENABLE_VEC4 +# include +# elif defined(__ARM_NEON) || defined(__ARM_NEON__) +# define ENABLE_VEC4 +# include +# endif #endif -#include "vresampler.h" - VResampler::VResampler (void) noexcept : _table (0),