From c4fb07f428fe5279a2871c4db490a1e65021a03c Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 21 Jun 2018 06:41:01 -0400
Subject: [PATCH] Common, DSP: Only compile in x86-64 emitter related utilities
 on x86 platforms

Previously these were required to be built into the executable so that
the JIT portion of the DSP code would build properly, as the
x86-64-specifics were tightly coupled to the DSP common code. As this is
no longer the case, this is no longer necessary.
---
 Source/Core/Common/CMakeLists.txt      |  4 ++--
 Source/Core/Core/CMakeLists.txt        | 22 +++++++++++-----------
 Source/UnitTests/Common/CMakeLists.txt |  6 ++++--
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
index 03881263b00..36d10185758 100644
--- a/Source/Core/Common/CMakeLists.txt
+++ b/Source/Core/Common/CMakeLists.txt
@@ -44,8 +44,6 @@ add_library(common
   TraversalClient.cpp
   UPnP.cpp
   Version.cpp
-  x64ABI.cpp
-  x64Emitter.cpp
 )
 
 target_link_libraries(common
@@ -93,6 +91,8 @@ if(_M_ARM_64)
 else()
   if(_M_X86) #X86
     target_sources(common PRIVATE
+      x64ABI.cpp
+      x64Emitter.cpp
       x64FPURoundMode.cpp
       x64CPUDetect.cpp
     )
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index ca0b61bc4db..77e09873fd4 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -60,17 +60,6 @@ add_library(core
   DSP/Interpreter/DSPIntMultiplier.cpp
   DSP/Interpreter/DSPIntTables.cpp
   DSP/Jit/DSPEmitterBase.cpp
-  DSP/Jit/x64/DSPEmitter.cpp
-  DSP/Jit/x64/DSPJitRegCache.cpp
-  DSP/Jit/x64/DSPJitExtOps.cpp
-  DSP/Jit/x64/DSPJitBranch.cpp
-  DSP/Jit/x64/DSPJitCCUtil.cpp
-  DSP/Jit/x64/DSPJitArithmetic.cpp
-  DSP/Jit/x64/DSPJitLoadStore.cpp
-  DSP/Jit/x64/DSPJitMisc.cpp
-  DSP/Jit/x64/DSPJitMultiplier.cpp
-  DSP/Jit/x64/DSPJitTables.cpp
-  DSP/Jit/x64/DSPJitUtil.cpp
   FifoPlayer/FifoAnalyzer.cpp
   FifoPlayer/FifoDataFile.cpp
   FifoPlayer/FifoPlaybackAnalyzer.cpp
@@ -235,6 +224,17 @@ add_library(core
 
 if(_M_X86)
   target_sources(core PRIVATE
+    DSP/Jit/x64/DSPEmitter.cpp
+    DSP/Jit/x64/DSPJitRegCache.cpp
+    DSP/Jit/x64/DSPJitExtOps.cpp
+    DSP/Jit/x64/DSPJitBranch.cpp
+    DSP/Jit/x64/DSPJitCCUtil.cpp
+    DSP/Jit/x64/DSPJitArithmetic.cpp
+    DSP/Jit/x64/DSPJitLoadStore.cpp
+    DSP/Jit/x64/DSPJitMisc.cpp
+    DSP/Jit/x64/DSPJitMultiplier.cpp
+    DSP/Jit/x64/DSPJitTables.cpp
+    DSP/Jit/x64/DSPJitUtil.cpp
     PowerPC/Jit64/FPURegCache.cpp
     PowerPC/Jit64/GPRRegCache.cpp
     PowerPC/Jit64/Jit64_Tables.cpp
diff --git a/Source/UnitTests/Common/CMakeLists.txt b/Source/UnitTests/Common/CMakeLists.txt
index ecd8ca0f29a..120fee6c330 100644
--- a/Source/UnitTests/Common/CMakeLists.txt
+++ b/Source/UnitTests/Common/CMakeLists.txt
@@ -15,5 +15,7 @@ add_dolphin_test(SPSCQueueTest SPSCQueueTest.cpp)
 add_dolphin_test(StringUtilTest StringUtilTest.cpp)
 add_dolphin_test(SwapTest SwapTest.cpp)
 
-add_dolphin_test(x64EmitterTest x64EmitterTest.cpp)
-target_link_libraries(x64EmitterTest PRIVATE bdisasm)
+if (_M_X86)
+  add_dolphin_test(x64EmitterTest x64EmitterTest.cpp)
+  target_link_libraries(x64EmitterTest PRIVATE bdisasm)
+endif()