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.
This commit is contained in:
Lioncash 2018-06-21 06:41:01 -04:00
parent 630c3f0805
commit c4fb07f428
3 changed files with 17 additions and 15 deletions

View File

@ -44,8 +44,6 @@ add_library(common
TraversalClient.cpp TraversalClient.cpp
UPnP.cpp UPnP.cpp
Version.cpp Version.cpp
x64ABI.cpp
x64Emitter.cpp
) )
target_link_libraries(common target_link_libraries(common
@ -93,6 +91,8 @@ if(_M_ARM_64)
else() else()
if(_M_X86) #X86 if(_M_X86) #X86
target_sources(common PRIVATE target_sources(common PRIVATE
x64ABI.cpp
x64Emitter.cpp
x64FPURoundMode.cpp x64FPURoundMode.cpp
x64CPUDetect.cpp x64CPUDetect.cpp
) )

View File

@ -60,17 +60,6 @@ add_library(core
DSP/Interpreter/DSPIntMultiplier.cpp DSP/Interpreter/DSPIntMultiplier.cpp
DSP/Interpreter/DSPIntTables.cpp DSP/Interpreter/DSPIntTables.cpp
DSP/Jit/DSPEmitterBase.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/FifoAnalyzer.cpp
FifoPlayer/FifoDataFile.cpp FifoPlayer/FifoDataFile.cpp
FifoPlayer/FifoPlaybackAnalyzer.cpp FifoPlayer/FifoPlaybackAnalyzer.cpp
@ -235,6 +224,17 @@ add_library(core
if(_M_X86) if(_M_X86)
target_sources(core PRIVATE 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/FPURegCache.cpp
PowerPC/Jit64/GPRRegCache.cpp PowerPC/Jit64/GPRRegCache.cpp
PowerPC/Jit64/Jit64_Tables.cpp PowerPC/Jit64/Jit64_Tables.cpp

View File

@ -15,5 +15,7 @@ add_dolphin_test(SPSCQueueTest SPSCQueueTest.cpp)
add_dolphin_test(StringUtilTest StringUtilTest.cpp) add_dolphin_test(StringUtilTest StringUtilTest.cpp)
add_dolphin_test(SwapTest SwapTest.cpp) add_dolphin_test(SwapTest SwapTest.cpp)
add_dolphin_test(x64EmitterTest x64EmitterTest.cpp) if (_M_X86)
target_link_libraries(x64EmitterTest PRIVATE bdisasm) add_dolphin_test(x64EmitterTest x64EmitterTest.cpp)
target_link_libraries(x64EmitterTest PRIVATE bdisasm)
endif()