mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-23 18:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove _M_X86 in favour of _M_X86_64

Browse source
This commit is contained in:
Zopolis4 2022-08-08 10:18:36 +10:00
commit f0d2ce4683
No known key found for this signature in database
GPG key ID: C1117D56FBC82774
16 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Core/CMakeLists.txt
View file

@ -537,7 +537,7 @@ add_library(core
WiiUtils.h
)
if(_M_X86)
if(_M_X86_64)
target_sources(core PRIVATE
DSP/Jit/x64/DSPEmitter.cpp
DSP/Jit/x64/DSPEmitter.h
@ -640,7 +640,7 @@ PRIVATE
)
if ((DEFINED CMAKE_ANDROID_ARCH_ABI AND CMAKE_ANDROID_ARCH_ABI MATCHES "x86|x86_64") OR
(NOT DEFINED CMAKE_ANDROID_ARCH_ABI AND _M_X86))
(NOT DEFINED CMAKE_ANDROID_ARCH_ABI AND _M_X86_64))
target_link_libraries(core PRIVATE bdisasm)
endif()

4
Source/Core/Core/DSP/Jit/DSPEmitterBase.cpp
View file

@ -3,7 +3,7 @@
#include "Core/DSP/Jit/DSPEmitterBase.h"
#if defined(_M_X86) || defined(_M_X86_64)
#if defined(_M_X86_64)
#include "Core/DSP/Jit/x64/DSPEmitter.h"
#endif
@ -13,7 +13,7 @@ DSPEmitter::~DSPEmitter() = default;
std::unique_ptr<DSPEmitter> CreateDSPEmitter([[maybe_unused]] DSPCore& dsp)
{
#if defined(_M_X86) || defined(_M_X86_64)
#if defined(_M_X86_64)
return std::make_unique<x64::DSPEmitter>(dsp);
#else
return std::make_unique<DSPEmitterNull>();

2
Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
View file

@ -120,7 +120,7 @@ static bool FillDSPInitOptions(DSPInitOptions* opts)
return false;
opts->core_type = DSPInitOptions::CoreType::Interpreter;
#ifdef _M_X86
#ifdef _M_X86_64
if (Config::Get(Config::MAIN_DSP_JIT))
opts->core_type = DSPInitOptions::CoreType::JIT64;
#endif

4
Source/Core/Core/PowerPC/JitInterface.cpp
View file

@ -32,7 +32,7 @@
#include "Core/PowerPC/Profiler.h"
#include "Core/System.h"
#if _M_X86
#if _M_X86_64
#include "Core/PowerPC/Jit64/Jit.h"
#endif
@ -61,7 +61,7 @@ CPUCoreBase* JitInterface::InitJitCore(PowerPC::CPUCore core)
{
switch (core)
{
#if _M_X86
#if _M_X86_64
case PowerPC::CPUCore::JIT64:
m_jit = std::make_unique<Jit64>(m_system);
break;