Move cpu_caps and fpu_ctrl to core

10 files changed, 17 insertions, 17 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f11b2f5..bf2310a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -656,6 +656,8 @@ set(CORE_OBJS
     core/bsinc_tables.cpp
     core/bsinc_tables.h
     core/bufferline.h
+    core/cpu_caps.cpp
+    core/cpu_caps.h
     core/devformat.cpp
     core/devformat.h
     core/except.cpp
@@ -668,6 +670,8 @@ set(CORE_OBJS
     core/filters/splitter.h
     core/fmt_traits.cpp
     core/fmt_traits.h
+    core/fpu_ctrl.cpp
+    core/fpu_ctrl.h
     core/logging.cpp
     core/logging.h
     core/mastering.cpp
@@ -731,8 +735,6 @@ set(ALC_OBJS
     alc/compat.h
     alc/converter.cpp
     alc/converter.h
-    alc/cpu_caps.cpp
-    alc/cpu_caps.h
     alc/effectslot.cpp
     alc/effectslot.h
     alc/effects/base.h
@@ -750,8 +752,6 @@ set(ALC_OBJS
     alc/effects/pshifter.cpp
     alc/effects/reverb.cpp
     alc/effects/vmorpher.cpp
-    alc/fpu_ctrl.cpp
-    alc/fpu_ctrl.h
     alc/front_stablizer.h
     alc/helpers.cpp
     alc/hrtf.cpp
diff --git a/al/auxeffectslot.cpp b/al/auxeffectslot.cpp
index 61a31774..9a319126 100644
--- a/al/auxeffectslot.cpp
+++ b/al/auxeffectslot.cpp
@@ -43,9 +43,9 @@
 #include "alu.h"
 #include "buffer.h"
 #include "core/except.h"
+#include "core/fpu_ctrl.h"
 #include "core/logging.h"
 #include "effect.h"
-#include "fpu_ctrl.h"
 #include "inprogext.h"
 #include "opthelpers.h"
 
diff --git a/alc/alc.cpp b/alc/alc.cpp
index 9bfc0b48..8cd902ed 100644
--- a/alc/alc.cpp
+++ b/alc/alc.cpp
@@ -80,16 +80,16 @@
 #include "compat.h"
 #include "core/ambidefs.h"
 #include "core/bs2b.h"
+#include "core/cpu_caps.h"
 #include "core/devformat.h"
 #include "core/except.h"
 #include "core/mastering.h"
 #include "core/filters/nfc.h"
 #include "core/filters/splitter.h"
+#include "core/fpu_ctrl.h"
 #include "core/logging.h"
 #include "core/uhjfilter.h"
-#include "cpu_caps.h"
 #include "effects/base.h"
-#include "fpu_ctrl.h"
 #include "front_stablizer.h"
 #include "hrtf.h"
 #include "inprogext.h"
diff --git a/alc/alu.cpp b/alc/alu.cpp
index 5128e305..fe4c54a1 100644
--- a/alc/alu.cpp
+++ b/alc/alu.cpp
@@ -56,17 +56,17 @@
 #include "core/ambidefs.h"
 #include "core/bs2b.h"
 #include "core/bsinc_tables.h"
+#include "core/cpu_caps.h"
 #include "core/devformat.h"
 #include "core/filters/biquad.h"
 #include "core/filters/nfc.h"
 #include "core/filters/splitter.h"
+#include "core/fpu_ctrl.h"
 #include "core/mastering.h"
 #include "core/mixer/defs.h"
 #include "core/uhjfilter.h"
-#include "cpu_caps.h"
 #include "effects/base.h"
 #include "effectslot.h"
-#include "fpu_ctrl.h"
 #include "front_stablizer.h"
 #include "hrtf.h"
 #include "inprogext.h"
diff --git a/alc/converter.cpp b/alc/converter.cpp
index 342085c5..5016b373 100644
--- a/alc/converter.cpp
+++ b/alc/converter.cpp
@@ -11,7 +11,7 @@
 
 #include "albyte.h"
 #include "alnumeric.h"
-#include "fpu_ctrl.h"
+#include "core/fpu_ctrl.h"
 
 struct CTag;
 struct CopyTag;
diff --git a/alc/voice.cpp b/alc/voice.cpp
index 5618f610..9c6ff6b5 100644
--- a/alc/voice.cpp
+++ b/alc/voice.cpp
@@ -45,6 +45,7 @@
 #include "alu.h"
 #include "async_event.h"
 #include "buffer_storage.h"
+#include "core/cpu_caps.h"
 #include "core/devformat.h"
 #include "core/filters/biquad.h"
 #include "core/filters/nfc.h"
@@ -53,7 +54,6 @@
 #include "core/logging.h"
 #include "core/mixer/defs.h"
 #include "core/mixer/hrtfdefs.h"
-#include "cpu_caps.h"
 #include "hrtf.h"
 #include "inprogext.h"
 #include "opthelpers.h"
diff --git a/alc/cpu_caps.cpp b/core/cpu_caps.cpp
index dc992663..dc992663 100644
--- a/alc/cpu_caps.cpp
+++ b/core/cpu_caps.cpp
diff --git a/alc/cpu_caps.h b/core/cpu_caps.h
index 190355b2..ffd671d0 100644
--- a/alc/cpu_caps.h
+++ b/core/cpu_caps.h
@@ -1,5 +1,5 @@
-#ifndef CPU_CAPS_H
-#define CPU_CAPS_H
+#ifndef CORE_CPU_CAPS_H
+#define CORE_CPU_CAPS_H
 
 #include <string>
 
@@ -23,4 +23,4 @@ struct CPUInfo {
 
 al::optional<CPUInfo> GetCPUInfo();
 
-#endif /* CPU_CAPS_H */
+#endif /* CORE_CPU_CAPS_H */
diff --git a/alc/fpu_ctrl.cpp b/core/fpu_ctrl.cpp
index 24021c7d..24021c7d 100644
--- a/alc/fpu_ctrl.cpp
+++ b/core/fpu_ctrl.cpp
diff --git a/alc/fpu_ctrl.h b/core/fpu_ctrl.h
index e89bdc29..20bd2772 100644
--- a/alc/fpu_ctrl.h
+++ b/core/fpu_ctrl.h
@@ -1,5 +1,5 @@
-#ifndef FPU_CTRL_H
-#define FPU_CTRL_H
+#ifndef CORE_FPU_CTRL_H
+#define CORE_FPU_CTRL_H
 
 class FPUCtl {
 #if defined(HAVE_SSE_INTRINSICS) || (defined(__GNUC__) && defined(HAVE_SSE))
@@ -22,4 +22,4 @@ public:
     void leave();
 };
 
-#endif /* FPU_CTRL_H */
+#endif /* CORE_FPU_CTRL_H */