build: Update to support multi-arch builds.

src/common/x64/cpu_detect.cpp

@@ -2,6 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "common/arch.h"
+#if CITRA_ARCH(x86_64)
+
 #include <cstring>
 #include "common/common_types.h"
 #include "common/x64/cpu_detect.h"
@@ -144,3 +147,5 @@ const CPUCaps& GetCPUCaps() {
 }
 
 } // namespace Common
+
+#endif // CITRA_ARCH(x86_64)

src/common/x64/cpu_detect.h

@@ -4,6 +4,9 @@
 
 #pragma once
 
+#include "common/arch.h"
+#if CITRA_ARCH(x86_64)
+
 namespace Common {
 
 /// x86/x64 CPU capabilities that may be detected by this module
@@ -33,3 +36,5 @@ struct CPUCaps {
 const CPUCaps& GetCPUCaps();
 
 } // namespace Common
+
+#endif // CITRA_ARCH(x86_64)

src/common/x64/xbyak_abi.h

@@ -4,6 +4,9 @@
 
 #pragma once
 
+#include "common/arch.h"
+#if CITRA_ARCH(x86_64)
+
 #include <bitset>
 #include <initializer_list>
 #include <xbyak/xbyak.h>
@@ -228,3 +231,5 @@ inline void ABI_PopRegistersAndAdjustStack(Xbyak::CodeGenerator& code, std::bits
 }
 
 } // namespace Common::X64
+
+#endif // CITRA_ARCH(x86_64)

src/common/x64/xbyak_util.h

@@ -4,6 +4,9 @@
 
 #pragma once
 
+#include "common/arch.h"
+#if CITRA_ARCH(x86_64)
+
 #include <type_traits>
 #include <xbyak/xbyak.h>
 #include "common/x64/xbyak_abi.h"
@@ -45,3 +48,5 @@ inline void CallFarFunction(Xbyak::CodeGenerator& code, const T f) {
 }
 
 } // namespace Common::X64
+
+#endif // CITRA_ARCH(x86_64)