From 9b502ad011a88561e582fffae1e457f07d048fff Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 5 Jan 2024 10:43:27 +0100 Subject: [PATCH] Try to fix build over SSE issues Signed-off-by: falkTX --- include/simd-compat/immintrin.h | 4 +++- include/simd/common.hpp | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/simd-compat/immintrin.h b/include/simd-compat/immintrin.h index d20a011f..572a2b6c 100644 --- a/include/simd-compat/immintrin.h +++ b/include/simd-compat/immintrin.h @@ -8,15 +8,17 @@ #include "simd-compat.h" -#ifdef SIMDE_X86_SSE_NATIVE +#if defined(CARDINAL_INCLUDING_EMULATED_IMMINTRIN_H) || defined(SIMDE_X86_SSE_NATIVE) # define CARDINAL_INCLUDING_IMMINTRIN_H # include_next # undef CARDINAL_INCLUDING_IMMINTRIN_H #else +# define CARDINAL_INCLUDING_EMULATED_IMMINTRIN_H # include "mmintrin.h" # include "xmmintrin.h" # include "emmintrin.h" # include "pmmintrin.h" # include "tmmintrin.h" # include "smmintrin.h" +# undef CARDINAL_INCLUDING_EMULATED_IMMINTRIN_H #endif diff --git a/include/simd/common.hpp b/include/simd/common.hpp index 0d097bc4..11daad74 100644 --- a/include/simd/common.hpp +++ b/include/simd/common.hpp @@ -6,9 +6,11 @@ #pragma once +#define CARDINAL_INCLUDING_EMULATED_IMMINTRIN_H #include "mmintrin.h" #include "xmmintrin.h" #include "emmintrin.h" #include "pmmintrin.h" #include "tmmintrin.h" #include "smmintrin.h" +#undef CARDINAL_INCLUDING_EMULATED_IMMINTRIN_H