diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-07-07 05:32:44 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-07-07 05:32:44 +0200 |
| commit | 59c938d3a7e21a17d778f346fc9a5ad39159ce6e (patch) | |
| tree | b68b786ff97715ba4c4cea863ce684f1d6e35d0c /Source/Core/DolphinWX/ConfigMain.cpp | |
| parent | 038111b2628a36ba12e5f1099559e5b3ceeafc99 (diff) | |
| parent | b0b70381f711f0acf5001f8d2cef8458b6473344 (diff) | |
Merge pull request #574 from dolphin-emu/revert-328-enum_cpubackend
Revert "Don't add segfault handler in interpreter mode"
Diffstat (limited to 'Source/Core/DolphinWX/ConfigMain.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ConfigMain.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index 47beeb8d0a..c74400a73f 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -32,7 +32,6 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" -#include "Core/CoreParameter.h" #include "Core/Movie.h" #include "Core/NetPlayProto.h" #include "Core/HW/EXI.h" @@ -58,17 +57,17 @@ struct CPUCore { - CPUBackend CPUid; + int CPUid; const char *name; }; const CPUCore CPUCores[] = { - {CPU_INTERPRETER, wxTRANSLATE("Interpreter (VERY slow)")}, + {0, wxTRANSLATE("Interpreter (VERY slow)")}, #ifdef _M_ARM - {CPU_JIT_ARM, wxTRANSLATE("Arm JIT (experimental)")}, - {CPU_JIT_IL_ARM, wxTRANSLATE("Arm JITIL (experimental)")}, + {3, wxTRANSLATE("Arm JIT (experimental)")}, + {4, wxTRANSLATE("Arm JITIL (experimental)")}, #else - {CPU_JIT_X64, wxTRANSLATE("JIT Recompiler (recommended)")}, - {CPU_JIT_IL_X64, wxTRANSLATE("JITIL Recompiler (slower, experimental)")}, + {1, wxTRANSLATE("JIT Recompiler (recommended)")}, + {2, wxTRANSLATE("JITIL Recompiler (slower, experimental)")}, #endif }; @@ -908,7 +907,7 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event) SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore = CPUCores[CPUEngine->GetSelection()].CPUid; if (main_frame->g_pCodeWindow) main_frame->g_pCodeWindow->GetMenuBar()->Check(IDM_INTERPRETER, - SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore == CPU_INTERPRETER); + SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore?false:true); break; case ID_NTSCJ: SConfig::GetInstance().m_LocalCoreStartupParameter.bForceNTSCJ = _NTSCJ->IsChecked(); |