summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2018-03-11 20:47:57 +0100
committerUwe Klotz <uklotz@mixxx.org>2018-03-11 20:47:57 +0100
commit7afe432dc7f5d74a11599fbb4acfbee775aa1d31 (patch)
tree7a2ab344bebadd567a83a39322f4120f58e84d99 /lib
parentce4a9ee9fb264f61ecfc17dc5328adde28d65d5b (diff)
Cherry pick commit from libebur128 upstream master
https://github.com/jiixyj/libebur128/pull/78
Diffstat (limited to 'lib')
-rw-r--r--lib/libebur128/ebur128/CMakeLists.txt5
-rw-r--r--lib/libebur128/ebur128/ebur128.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/libebur128/ebur128/CMakeLists.txt b/lib/libebur128/ebur128/CMakeLists.txt
index d77385e23f..420caa5b7e 100644
--- a/lib/libebur128/ebur128/CMakeLists.txt
+++ b/lib/libebur128/ebur128/CMakeLists.txt
@@ -17,8 +17,9 @@ endif()
if(MSVC)
add_definitions(-D_USE_MATH_DEFINES)
- add_definitions(/arch:SSE2)
- add_definitions(-D __SSE2_MATH__)
+ if(CMAKE_SIZEOF_VOID_P LESS 8)
+ add_definitions(/arch:SSE2)
+ endif()
endif()
diff --git a/lib/libebur128/ebur128/ebur128.c b/lib/libebur128/ebur128/ebur128.c
index 2e987102cb..e05165b096 100644
--- a/lib/libebur128/ebur128/ebur128.c
+++ b/lib/libebur128/ebur128/ebur128.c
@@ -528,7 +528,7 @@ static void ebur128_check_true_peak(ebur128_state* st, size_t frames) {
}
}
-#ifdef __SSE2_MATH__
+#if defined(__SSE2_MATH__) || defined(_M_X64) || _M_IX86_FP >= 2
#include <xmmintrin.h>
#define TURN_ON_FTZ \
unsigned int mxcsr = _mm_getcsr(); \