From 2edd04717838bee32e2ecc9a1939b9c54ae979e7 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 5 May 2014 13:53:07 -0700 Subject: [PATCH] C11's alignas is also sufficient for SSE aligning --- CMakeLists.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f1674a5..616a1999 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -537,14 +537,16 @@ OPTION(ALSOFT_REQUIRE_SSE "Require SSE/SSE2 support" OFF) CHECK_INCLUDE_FILE(xmmintrin.h HAVE_XMMINTRIN_H "${SSE_SWITCH}") IF(HAVE_XMMINTRIN_H) OPTION(ALSOFT_CPUEXT_SSE "Enable SSE/SSE2 support" ON) - IF(ALSOFT_CPUEXT_SSE AND ALIGN_DECL) - SET(HAVE_SSE 1) - SET(ALC_OBJS ${ALC_OBJS} Alc/mixer_sse.c) - IF(SSE_SWITCH) - SET_SOURCE_FILES_PROPERTIES(Alc/mixer_sse.c PROPERTIES - COMPILE_FLAGS "${SSE_SWITCH}") + IF(ALSOFT_CPUEXT_SSE) + IF(ALIGN_DECL OR HAVE_C11_ALIGNAS) + SET(HAVE_SSE 1) + SET(ALC_OBJS ${ALC_OBJS} Alc/mixer_sse.c) + IF(SSE_SWITCH) + SET_SOURCE_FILES_PROPERTIES(Alc/mixer_sse.c PROPERTIES + COMPILE_FLAGS "${SSE_SWITCH}") + ENDIF() + SET(CPU_EXTS "${CPU_EXTS}, SSE") ENDIF() - SET(CPU_EXTS "${CPU_EXTS}, SSE") ENDIF() ENDIF() IF(ALSOFT_REQUIRE_SSE AND NOT HAVE_SSE) -- 2.11.4.GIT