Add cmake options to disable or require support for CPU extensions

2 files changed, 13 insertions, 7 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index 14a74a92..ee2bd8a9 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -791,7 +791,13 @@ static void alc_initconfig(void)
 
     ReadALConfig();
 
-    capfilter = CPU_CAP_ALL;
+    capfilter = 0;
+#ifdef HAVE_SSE
+    capfilter |= CPU_CAP_SSE;
+#endif
+#ifdef HAVE_NEON
+    capfilter |= CPU_CAP_NEON;
+#endif
     if(ConfigValueStr(NULL, "disable-cpu-exts", &str))
     {
         if(strcasecmp(str, "all") == 0)
diff --git a/Alc/mixer.c b/Alc/mixer.c
index 7454ec48..10e3d4e2 100644
--- a/Alc/mixer.c
+++ b/Alc/mixer.c
@@ -41,7 +41,7 @@
 
 DryMixerFunc SelectDirectMixer(enum Resampler Resampler)
 {
-#ifdef HAVE_XMMINTRIN_H
+#ifdef HAVE_SSE
     if((CPUCapFlags&CPU_CAP_SSE))
     {
         switch(Resampler)
@@ -57,7 +57,7 @@ DryMixerFunc SelectDirectMixer(enum Resampler Resampler)
         }
     }
 #endif
-#ifdef HAVE_ARM_NEON_H
+#ifdef HAVE_NEON
     if((CPUCapFlags&CPU_CAP_NEON))
     {
         switch(Resampler)
@@ -90,7 +90,7 @@ DryMixerFunc SelectDirectMixer(enum Resampler Resampler)
 
 DryMixerFunc SelectHrtfMixer(enum Resampler Resampler)
 {
-#ifdef HAVE_XMMINTRIN_H
+#ifdef HAVE_SSE
     if((CPUCapFlags&CPU_CAP_SSE))
     {
         switch(Resampler)
@@ -106,7 +106,7 @@ DryMixerFunc SelectHrtfMixer(enum Resampler Resampler)
         }
     }
 #endif
-#ifdef HAVE_ARM_NEON_H
+#ifdef HAVE_NEON
     if((CPUCapFlags&CPU_CAP_NEON))
     {
         switch(Resampler)
@@ -139,7 +139,7 @@ DryMixerFunc SelectHrtfMixer(enum Resampler Resampler)
 
 WetMixerFunc SelectSendMixer(enum Resampler Resampler)
 {
-#ifdef HAVE_XMMINTRIN_H
+#ifdef HAVE_SSE
     if((CPUCapFlags&CPU_CAP_SSE))
     {
         switch(Resampler)
@@ -155,7 +155,7 @@ WetMixerFunc SelectSendMixer(enum Resampler Resampler)
         }
     }
 #endif
-#ifdef HAVE_ARM_NEON_H
+#ifdef HAVE_NEON
     if((CPUCapFlags&CPU_CAP_NEON))
     {
         switch(Resampler)