Merge branch 'restrict_emmintrin_to_msvc_x86_64' into windows-arm64

obsproject · Jul 29, 2021 · 0285e53 · 0285e53
2 parents 51abbb7 + f04a419
commit 0285e53
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/libobs/util/sse-intrin.h b/libobs/util/sse-intrin.h
@@ -18,7 +18,8 @@
 #pragma once
 
 #if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86)) && \
-	!defined(_M_ARM64)
+	!(defined(_M_ARM64) || defined(_M_ARM64EC))
+
 #include <emmintrin.h>
 #else
 #define SIMDE_ENABLE_NATIVE_ALIASES