diff --git a/CSafe.pch b/CSafe.pch new file mode 100755 index 000000000..38402e29e --- /dev/null +++ b/CSafe.pch @@ -0,0 +1,3 @@ +#ifdef __cplusplus +#include "Source/PCH/pch.h" +#endif diff --git a/Compatibility/Audio/AudioCommon.cpp b/Compatibility/Audio/AudioCommon.cpp index bda290fc0..607253339 100644 --- a/Compatibility/Audio/AudioCommon.cpp +++ b/Compatibility/Audio/AudioCommon.cpp @@ -9,6 +9,7 @@ #include "Common/Common.h" #include "Common/FileUtil.h" #include "Common/Logging/Log.h" +#include "Core/Config/MainSettings.h" #include "Core/ConfigManager.h" // This shouldn't be a global, at least not here. @@ -34,16 +35,24 @@ namespace AudioCommon UpdateSoundStream(); SetSoundStreamRunning(true); - - if (SConfig::GetInstance().m_DumpAudio && !s_audio_dump_start) - StartAudioDump(); } + void PostInitSoundStream() + { + // This needs to be called after AudioInterface::Init and SerialInterface::Init (for GBA devices) + // where input sample rates are set + UpdateSoundStream(); + SetSoundStreamRunning(true); + + if (Config::Get(Config::MAIN_DUMP_AUDIO) && !s_audio_dump_start) + StartAudioDump(); + } + void ShutdownSoundStream() { INFO_LOG(AUDIO, "Shutting down sound stream"); - if (SConfig::GetInstance().m_DumpAudio && s_audio_dump_start) + if (Config::Get(Config::MAIN_DUMP_AUDIO) && s_audio_dump_start) StopAudioDump(); SetSoundStreamRunning(false); @@ -92,7 +101,7 @@ DPL2Quality GetDefaultDPL2Quality() { if (g_sound_stream) { - int volume = SConfig::GetInstance().m_IsMuted ? 0 : SConfig::GetInstance().m_Volume; + int volume = Config::Get(Config::MAIN_AUDIO_MUTED) ? 0 : Config::Get(Config::MAIN_AUDIO_VOLUME); g_sound_stream->SetVolume(volume); } } @@ -119,9 +128,9 @@ DPL2Quality GetDefaultDPL2Quality() if (!g_sound_stream) return; - if (SConfig::GetInstance().m_DumpAudio && !s_audio_dump_start) + if (Config::Get(Config::MAIN_DUMP_AUDIO) && !s_audio_dump_start) StartAudioDump(); - else if (!SConfig::GetInstance().m_DumpAudio && s_audio_dump_start) + else if (!Config::Get(Config::MAIN_DUMP_AUDIO) && s_audio_dump_start) StopAudioDump(); Mixer* pMixer = g_sound_stream->GetMixer(); @@ -130,8 +139,6 @@ DPL2Quality GetDefaultDPL2Quality() { pMixer->PushSamples(samples, num_samples); } - - g_sound_stream->Update(); } void StartAudioDump() @@ -156,28 +163,30 @@ DPL2Quality GetDefaultDPL2Quality() void IncreaseVolume(unsigned short offset) { - SConfig::GetInstance().m_IsMuted = false; - int& currentVolume = SConfig::GetInstance().m_Volume; + Config::SetBaseOrCurrent(Config::MAIN_AUDIO_MUTED, false); + int currentVolume = Config::Get(Config::MAIN_AUDIO_VOLUME); currentVolume += offset; if (currentVolume > AUDIO_VOLUME_MAX) currentVolume = AUDIO_VOLUME_MAX; + Config::SetBaseOrCurrent(Config::MAIN_AUDIO_VOLUME, currentVolume); UpdateSoundStream(); } void DecreaseVolume(unsigned short offset) { - SConfig::GetInstance().m_IsMuted = false; - int& currentVolume = SConfig::GetInstance().m_Volume; + Config::SetBaseOrCurrent(Config::MAIN_AUDIO_MUTED, false); + int currentVolume = Config::Get(Config::MAIN_AUDIO_VOLUME); currentVolume -= offset; if (currentVolume < AUDIO_VOLUME_MIN) currentVolume = AUDIO_VOLUME_MIN; + Config::SetBaseOrCurrent(Config::MAIN_AUDIO_VOLUME, currentVolume); UpdateSoundStream(); } void ToggleMuteVolume() { - bool& isMuted = SConfig::GetInstance().m_IsMuted; - isMuted = !isMuted; - UpdateSoundStream(); + bool isMuted = Config::Get(Config::MAIN_AUDIO_MUTED); + Config::SetBaseOrCurrent(Config::MAIN_AUDIO_MUTED, !isMuted); + UpdateSoundStream(); } } // namespace AudioCommon diff --git a/Compatibility/Common/CPUDetect.cpp b/Compatibility/Common/CPUDetect.cpp index 5979fd68f..d7eb5d403 100644 --- a/Compatibility/Common/CPUDetect.cpp +++ b/Compatibility/Common/CPUDetect.cpp @@ -24,6 +24,6 @@ #ifdef __x86_64__ #include "../../dolphin/Source/Core/Common/x64CPUDetect.cpp" -//#elif defined(__arm64__) -//#include "../../dolphin/Source/Core/Common/ArmCPUDetect.cpp" +#elif defined(__arm64__) +#include "../../dolphin/Source/Core/Common/ArmCPUDetect.cpp" #endif diff --git a/Compatibility/Common/FileUtil.cpp b/Compatibility/Common/FileUtil.cpp index 610aa6299..134a1ef24 100755 --- a/Compatibility/Common/FileUtil.cpp +++ b/Compatibility/Common/FileUtil.cpp @@ -20,7 +20,7 @@ #include "Common/CommonFuncs.h" #include "Common/CommonPaths.h" #include "Common/CommonTypes.h" -#include "Common/File.h" +#include "Common/IOFile.h" #include "Common/FileUtil.h" #include "Common/Logging/Log.h" @@ -479,7 +479,7 @@ bool CreateEmptyFile(const std::string& filename) } // Recursive or non-recursive list of files and directories under directory. -FSTEntry ScanDirectoryTree(const std::string& directory, bool recursive) +FSTEntry ScanDirectoryTree(std::string directory, bool recursive) { INFO_LOG_FMT(COMMON, "ScanDirectoryTree: directory {}", directory); FSTEntry parent_entry; @@ -781,7 +781,7 @@ std::string GetTempFilenameForAtomicWrite(std::string path) std::string GetBundleDirectory() { //OpenEmu - GET_CURRENT_OR_RETURN(); + GET_CURRENT_OR_RETURN(""); return [current getBundlePath]; } @@ -993,7 +993,7 @@ const std::string& GetUserPath(unsigned int dir_index) // Sets a user directory path // Rebuilds internal directory structure to compensate for the new directory -void SetUserPath(unsigned int dir_index, const std::string& path) +void SetUserPath(unsigned int dir_index, std::string path) { if (path.empty()) return; diff --git a/Compatibility/Core/ConfigManager.cpp b/Compatibility/Core/ConfigManager.cpp index ac59b950c..53eb6a596 100644 --- a/Compatibility/Core/ConfigManager.cpp +++ b/Compatibility/Core/ConfigManager.cpp @@ -28,7 +28,6 @@ #include "Common/StringUtil.h" #include "Common/scmrev.h" -#include "Core/Analytics.h" #include "Core/Boot/Boot.h" #include "Core/CommonTitles.h" #include "Core/Config/MainSettings.h" @@ -82,538 +81,13 @@ SConfig::~SConfig() void SConfig::SaveSettings() { NOTICE_LOG_FMT(BOOT, "Saving settings to {}", File::GetUserPath(F_DOLPHINCONFIG_IDX)); - IniFile ini; - ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)); // load first to not kill unknown stuff - - SaveGeneralSettings(ini); - SaveInterfaceSettings(ini); - SaveGameListSettings(ini); - SaveCoreSettings(ini); - SaveMovieSettings(ini); - SaveDSPSettings(ini); - SaveInputSettings(ini); - SaveFifoPlayerSettings(ini); - SaveBluetoothPassthroughSettings(ini); - SaveUSBPassthroughSettings(ini); - SaveAutoUpdateSettings(ini); - SaveJitDebugSettings(ini); - - ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX)); - Config::Save(); } -void SConfig::SaveGeneralSettings(IniFile& ini) -{ - IniFile::Section* general = ini.GetOrCreateSection("General"); - - // General - general->Set("ShowLag", m_ShowLag); - general->Set("ShowFrameCount", m_ShowFrameCount); - - // ISO folders - // Clear removed folders - int oldPaths; - int numPaths = (int)m_ISOFolder.size(); - general->Get("ISOPaths", &oldPaths, 0); - for (int i = numPaths; i < oldPaths; i++) - { - ini.DeleteKey("General", fmt::format("ISOPath{}", i)); - } - - general->Set("ISOPaths", numPaths); - for (int i = 0; i < numPaths; i++) - { - general->Set(fmt::format("ISOPath{}", i), m_ISOFolder[i]); - } - - general->Set("WirelessMac", m_WirelessMac); - -#ifdef USE_GDBSTUB -#ifndef _WIN32 - general->Set("GDBSocket", gdb_socket); -#endif - general->Set("GDBPort", iGDBPort); -#endif -} - -void SConfig::SaveInterfaceSettings(IniFile& ini) -{ - IniFile::Section* interface = ini.GetOrCreateSection("Interface"); - - interface->Set("ConfirmStop", bConfirmStop); - interface->Set("HideCursor", bHideCursor); - interface->Set("LanguageCode", m_InterfaceLanguage); - interface->Set("ExtendedFPSInfo", m_InterfaceExtendedFPSInfo); - interface->Set("ShowActiveTitle", m_show_active_title); - interface->Set("UseBuiltinTitleDatabase", m_use_builtin_title_database); - interface->Set("ThemeName", theme_name); - interface->Set("PauseOnFocusLost", m_PauseOnFocusLost); - interface->Set("DebugModeEnabled", bEnableDebugging); -} - -void SConfig::SaveGameListSettings(IniFile& ini) -{ - IniFile::Section* gamelist = ini.GetOrCreateSection("GameList"); - - gamelist->Set("ListDrives", m_ListDrives); - gamelist->Set("ListWad", m_ListWad); - gamelist->Set("ListElfDol", m_ListElfDol); - gamelist->Set("ListWii", m_ListWii); - gamelist->Set("ListGC", m_ListGC); - gamelist->Set("ListJap", m_ListJap); - gamelist->Set("ListPal", m_ListPal); - gamelist->Set("ListUsa", m_ListUsa); - gamelist->Set("ListAustralia", m_ListAustralia); - gamelist->Set("ListFrance", m_ListFrance); - gamelist->Set("ListGermany", m_ListGermany); - gamelist->Set("ListItaly", m_ListItaly); - gamelist->Set("ListKorea", m_ListKorea); - gamelist->Set("ListNetherlands", m_ListNetherlands); - gamelist->Set("ListRussia", m_ListRussia); - gamelist->Set("ListSpain", m_ListSpain); - gamelist->Set("ListTaiwan", m_ListTaiwan); - gamelist->Set("ListWorld", m_ListWorld); - gamelist->Set("ListUnknown", m_ListUnknown); - gamelist->Set("ListSort", m_ListSort); - gamelist->Set("ListSortSecondary", m_ListSort2); - - gamelist->Set("ColumnPlatform", m_showSystemColumn); - gamelist->Set("ColumnBanner", m_showBannerColumn); - gamelist->Set("ColumnDescription", m_showDescriptionColumn); - gamelist->Set("ColumnTitle", m_showTitleColumn); - gamelist->Set("ColumnNotes", m_showMakerColumn); - gamelist->Set("ColumnFileName", m_showFileNameColumn); - gamelist->Set("ColumnFilePath", m_showFilePathColumn); - gamelist->Set("ColumnID", m_showIDColumn); - gamelist->Set("ColumnRegion", m_showRegionColumn); - gamelist->Set("ColumnSize", m_showSizeColumn); - gamelist->Set("ColumnFileFormat", m_showFileFormatColumn); - gamelist->Set("ColumnBlockSize", m_showBlockSizeColumn); - gamelist->Set("ColumnCompression", m_showCompressionColumn); - gamelist->Set("ColumnTags", m_showTagsColumn); -} - -void SConfig::SaveCoreSettings(IniFile& ini) -{ - IniFile::Section* core = ini.GetOrCreateSection("Core"); - - core->Set("SkipIPL", bHLE_BS2); - core->Set("TimingVariance", iTimingVariance); - core->Set("CPUCore", cpu_core); - core->Set("Fastmem", bFastmem); - core->Set("CPUThread", bCPUThread); - core->Set("DSPHLE", bDSPHLE); - core->Set("SyncOnSkipIdle", bSyncGPUOnSkipIdleHack); - core->Set("SyncGPU", bSyncGPU); - core->Set("SyncGpuMaxDistance", iSyncGpuMaxDistance); - core->Set("SyncGpuMinDistance", iSyncGpuMinDistance); - core->Set("SyncGpuOverclock", fSyncGpuOverclock); - core->Set("FPRF", bFPRF); - core->Set("AccurateNaNs", bAccurateNaNs); - core->Set("EnableCheats", bEnableCheats); - core->Set("SelectedLanguage", SelectedLanguage); - core->Set("OverrideRegionSettings", bOverrideRegionSettings); - core->Set("DPL2Decoder", bDPL2Decoder); - core->Set("AudioLatency", iLatency); - core->Set("AudioStretch", m_audio_stretch); - core->Set("AudioStretchMaxLatency", m_audio_stretch_max_latency); - core->Set("AgpCartAPath", m_strGbaCartA); - core->Set("AgpCartBPath", m_strGbaCartB); - core->Set("SlotA", m_EXIDevice[0]); - core->Set("SlotB", m_EXIDevice[1]); - core->Set("SerialPort1", m_EXIDevice[2]); - core->Set("BBA_MAC", m_bba_mac); - core->Set("BBA_XLINK_IP", m_bba_xlink_ip); - core->Set("BBA_XLINK_CHAT_OSD", m_bba_xlink_chat_osd); - for (int i = 0; i < SerialInterface::MAX_SI_CHANNELS; ++i) - { - core->Set(fmt::format("SIDevice{}", i), m_SIDevice[i]); - core->Set(fmt::format("AdapterRumble{}", i), m_AdapterRumble[i]); - core->Set(fmt::format("SimulateKonga{}", i), m_AdapterKonga[i]); - } - core->Set("WiiSDCard", m_WiiSDCard); - core->Set("WiiKeyboard", m_WiiKeyboard); - core->Set("WiimoteContinuousScanning", m_WiimoteContinuousScanning); - core->Set("WiimoteEnableSpeaker", m_WiimoteEnableSpeaker); - core->Set("WiimoteControllerInterface", connect_wiimotes_for_ciface); - core->Set("RunCompareServer", bRunCompareServer); - core->Set("RunCompareClient", bRunCompareClient); - core->Set("MMU", bMMU); - core->Set("EmulationSpeed", m_EmulationSpeed); - core->Set("Overclock", m_OCFactor); - core->Set("OverclockEnable", m_OCEnable); - core->Set("GPUDeterminismMode", m_strGPUDeterminismMode); - core->Set("PerfMapDir", m_perfDir); - core->Set("EnableCustomRTC", bEnableCustomRTC); - core->Set("CustomRTCValue", m_customRTCValue); -} - -void SConfig::SaveMovieSettings(IniFile& ini) -{ - IniFile::Section* movie = ini.GetOrCreateSection("Movie"); - - movie->Set("PauseMovie", m_PauseMovie); - movie->Set("Author", m_strMovieAuthor); - movie->Set("DumpFrames", m_DumpFrames); - movie->Set("DumpFramesSilent", m_DumpFramesSilent); - movie->Set("ShowInputDisplay", m_ShowInputDisplay); - movie->Set("ShowRTC", m_ShowRTC); -} - -void SConfig::SaveDSPSettings(IniFile& ini) -{ - IniFile::Section* dsp = ini.GetOrCreateSection("DSP"); - - dsp->Set("EnableJIT", m_DSPEnableJIT); - dsp->Set("DumpAudio", m_DumpAudio); - dsp->Set("DumpAudioSilent", m_DumpAudioSilent); - dsp->Set("DumpUCode", m_DumpUCode); - dsp->Set("Backend", sBackend); - dsp->Set("Volume", m_Volume); - dsp->Set("CaptureLog", m_DSPCaptureLog); - -#ifdef _WIN32 - dsp->Set("WASAPIDevice", sWASAPIDevice); -#endif -} - -void SConfig::SaveInputSettings(IniFile& ini) -{ - IniFile::Section* input = ini.GetOrCreateSection("Input"); - - input->Set("BackgroundInput", m_BackgroundInput); -} - -void SConfig::SaveFifoPlayerSettings(IniFile& ini) -{ - IniFile::Section* fifoplayer = ini.GetOrCreateSection("FifoPlayer"); - - fifoplayer->Set("LoopReplay", bLoopFifoReplay); -} - -void SConfig::SaveBluetoothPassthroughSettings(IniFile& ini) -{ - IniFile::Section* section = ini.GetOrCreateSection("BluetoothPassthrough"); - - section->Set("Enabled", m_bt_passthrough_enabled); - section->Set("VID", m_bt_passthrough_vid); - section->Set("PID", m_bt_passthrough_pid); - section->Set("LinkKeys", m_bt_passthrough_link_keys); -} - -void SConfig::SaveUSBPassthroughSettings(IniFile& ini) -{ - IniFile::Section* section = ini.GetOrCreateSection("USBPassthrough"); - - std::ostringstream oss; - for (const auto& device : m_usb_passthrough_devices) - oss << fmt::format("{:04x}:{:04x}", device.first, device.second) << ','; - std::string devices_string = oss.str(); - if (!devices_string.empty()) - devices_string.pop_back(); - - section->Set("Devices", devices_string); -} - -void SConfig::SaveAutoUpdateSettings(IniFile& ini) -{ - IniFile::Section* section = ini.GetOrCreateSection("AutoUpdate"); - - section->Set("UpdateTrack", m_auto_update_track); - section->Set("HashOverride", m_auto_update_hash_override); -} - -void SConfig::SaveJitDebugSettings(IniFile& ini) -{ - IniFile::Section* section = ini.GetOrCreateSection("Debug"); - - section->Set("JitOff", bJITOff); - section->Set("JitLoadStoreOff", bJITLoadStoreOff); - section->Set("JitLoadStoreFloatingOff", bJITLoadStoreFloatingOff); - section->Set("JitLoadStorePairedOff", bJITLoadStorePairedOff); - section->Set("JitFloatingPointOff", bJITFloatingPointOff); - section->Set("JitIntegerOff", bJITIntegerOff); - section->Set("JitPairedOff", bJITPairedOff); - section->Set("JitSystemRegistersOff", bJITSystemRegistersOff); - section->Set("JitBranchOff", bJITBranchOff); - section->Set("JitRegisterCacheOff", bJITRegisterCacheOff); -} - void SConfig::LoadSettings() { - Config::Load(); - INFO_LOG_FMT(BOOT, "Loading Settings from {}", File::GetUserPath(F_DOLPHINCONFIG_IDX)); - IniFile ini; - ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)); - - LoadGeneralSettings(ini); - LoadInterfaceSettings(ini); - LoadGameListSettings(ini); - LoadCoreSettings(ini); - LoadMovieSettings(ini); - LoadDSPSettings(ini); - LoadInputSettings(ini); - LoadFifoPlayerSettings(ini); - LoadBluetoothPassthroughSettings(ini); - LoadUSBPassthroughSettings(ini); - LoadAutoUpdateSettings(ini); - LoadJitDebugSettings(ini); -} - -void SConfig::LoadGeneralSettings(IniFile& ini) -{ - IniFile::Section* general = ini.GetOrCreateSection("General"); - - general->Get("ShowLag", &m_ShowLag, false); - general->Get("ShowFrameCount", &m_ShowFrameCount, false); -#ifdef USE_GDBSTUB -#ifndef _WIN32 - general->Get("GDBSocket", &gdb_socket, ""); -#endif - general->Get("GDBPort", &(iGDBPort), -1); -#endif - - m_ISOFolder.clear(); - int numISOPaths; - - if (general->Get("ISOPaths", &numISOPaths, 0)) - { - for (int i = 0; i < numISOPaths; i++) - { - std::string tmpPath; - general->Get(fmt::format("ISOPath{}", i), &tmpPath, ""); - m_ISOFolder.push_back(std::move(tmpPath)); - } - } - - general->Get("WirelessMac", &m_WirelessMac); -} - -void SConfig::LoadInterfaceSettings(IniFile& ini) -{ - IniFile::Section* interface = ini.GetOrCreateSection("Interface"); - - interface->Get("ConfirmStop", &bConfirmStop, true); - interface->Get("HideCursor", &bHideCursor, false); - interface->Get("LanguageCode", &m_InterfaceLanguage, ""); - interface->Get("ExtendedFPSInfo", &m_InterfaceExtendedFPSInfo, false); - interface->Get("ShowActiveTitle", &m_show_active_title, true); - interface->Get("UseBuiltinTitleDatabase", &m_use_builtin_title_database, true); - interface->Get("ThemeName", &theme_name, DEFAULT_THEME_DIR); - interface->Get("PauseOnFocusLost", &m_PauseOnFocusLost, false); - interface->Get("DebugModeEnabled", &bEnableDebugging, false); -} - -void SConfig::LoadGameListSettings(IniFile& ini) -{ - IniFile::Section* gamelist = ini.GetOrCreateSection("GameList"); - - gamelist->Get("ListDrives", &m_ListDrives, false); - gamelist->Get("ListWad", &m_ListWad, true); - gamelist->Get("ListElfDol", &m_ListElfDol, true); - gamelist->Get("ListWii", &m_ListWii, true); - gamelist->Get("ListGC", &m_ListGC, true); - gamelist->Get("ListJap", &m_ListJap, true); - gamelist->Get("ListPal", &m_ListPal, true); - gamelist->Get("ListUsa", &m_ListUsa, true); - - gamelist->Get("ListAustralia", &m_ListAustralia, true); - gamelist->Get("ListFrance", &m_ListFrance, true); - gamelist->Get("ListGermany", &m_ListGermany, true); - gamelist->Get("ListItaly", &m_ListItaly, true); - gamelist->Get("ListKorea", &m_ListKorea, true); - gamelist->Get("ListNetherlands", &m_ListNetherlands, true); - gamelist->Get("ListRussia", &m_ListRussia, true); - gamelist->Get("ListSpain", &m_ListSpain, true); - gamelist->Get("ListTaiwan", &m_ListTaiwan, true); - gamelist->Get("ListWorld", &m_ListWorld, true); - gamelist->Get("ListUnknown", &m_ListUnknown, true); - gamelist->Get("ListSort", &m_ListSort, 3); - gamelist->Get("ListSortSecondary", &m_ListSort2, 0); - - // Gamelist columns toggles - gamelist->Get("ColumnPlatform", &m_showSystemColumn, true); - gamelist->Get("ColumnDescription", &m_showDescriptionColumn, false); - gamelist->Get("ColumnBanner", &m_showBannerColumn, true); - gamelist->Get("ColumnTitle", &m_showTitleColumn, true); - gamelist->Get("ColumnNotes", &m_showMakerColumn, true); - gamelist->Get("ColumnFileName", &m_showFileNameColumn, false); - gamelist->Get("ColumnFilePath", &m_showFilePathColumn, false); - gamelist->Get("ColumnID", &m_showIDColumn, false); - gamelist->Get("ColumnRegion", &m_showRegionColumn, true); - gamelist->Get("ColumnSize", &m_showSizeColumn, true); - gamelist->Get("ColumnFileFormat", &m_showFileFormatColumn, false); - gamelist->Get("ColumnBlockSize", &m_showBlockSizeColumn, false); - gamelist->Get("ColumnCompression", &m_showCompressionColumn, false); - gamelist->Get("ColumnTags", &m_showTagsColumn, false); -} - -void SConfig::LoadCoreSettings(IniFile& ini) -{ - IniFile::Section* core = ini.GetOrCreateSection("Core"); - - core->Get("SkipIPL", &bHLE_BS2, true); -#ifdef _M_X86 - core->Get("CPUCore", &cpu_core, PowerPC::CPUCore::JIT64); -#elif _M_ARM_64 - core->Get("CPUCore", &cpu_core, PowerPC::CPUCore::JITARM64); -#else - core->Get("CPUCore", &cpu_core, PowerPC::CPUCore::Interpreter); -#endif - core->Get("JITFollowBranch", &bJITFollowBranch, true); - core->Get("Fastmem", &bFastmem, true); - core->Get("DSPHLE", &bDSPHLE, true); - core->Get("TimingVariance", &iTimingVariance, 40); - core->Get("CPUThread", &bCPUThread, true); - core->Get("SyncOnSkipIdle", &bSyncGPUOnSkipIdleHack, true); - core->Get("EnableCheats", &bEnableCheats, false); - core->Get("SelectedLanguage", &SelectedLanguage, 0); - core->Get("OverrideRegionSettings", &bOverrideRegionSettings, false); - core->Get("DPL2Decoder", &bDPL2Decoder, false); - core->Get("AudioLatency", &iLatency, 20); - core->Get("AudioStretch", &m_audio_stretch, false); - core->Get("AudioStretchMaxLatency", &m_audio_stretch_max_latency, 80); - core->Get("AgpCartAPath", &m_strGbaCartA); - core->Get("AgpCartBPath", &m_strGbaCartB); - core->Get("SlotA", (int*)&m_EXIDevice[0], ExpansionInterface::EXIDEVICE_MEMORYCARDFOLDER); - core->Get("SlotB", (int*)&m_EXIDevice[1], ExpansionInterface::EXIDEVICE_NONE); - core->Get("SerialPort1", (int*)&m_EXIDevice[2], ExpansionInterface::EXIDEVICE_NONE); - core->Get("BBA_MAC", &m_bba_mac); - core->Get("BBA_XLINK_IP", &m_bba_xlink_ip, "127.0.0.1"); - core->Get("BBA_XLINK_CHAT_OSD", &m_bba_xlink_chat_osd, true); - for (size_t i = 0; i < std::size(m_SIDevice); ++i) - { - //OpenEmu change all controllers to GaceCube Controllers - //core->Get(fmt::format("SIDevice{}", i), &m_SIDevice[i], - //(i == 0) ? SerialInterface::SIDEVICE_GC_CONTROLLER : SerialInterface::SIDEVICE_NONE); - core->Get(fmt::format("SIDevice{}", i), &m_SIDevice[i], SerialInterface::SIDEVICE_GC_CONTROLLER); - core->Get(fmt::format("AdapterRumble{}", i), &m_AdapterRumble[i], false); - core->Get(fmt::format("SimulateKonga{}", i), &m_AdapterKonga[i], false); - } - core->Get("WiiSDCard", &m_WiiSDCard, true); - core->Get("WiiKeyboard", &m_WiiKeyboard, false); - core->Get("WiimoteContinuousScanning", &m_WiimoteContinuousScanning, false); - core->Get("WiimoteEnableSpeaker", &m_WiimoteEnableSpeaker, false); - core->Get("WiimoteControllerInterface", &connect_wiimotes_for_ciface, false); - core->Get("RunCompareServer", &bRunCompareServer, false); - core->Get("RunCompareClient", &bRunCompareClient, false); - core->Get("MMU", &bMMU, bMMU); - core->Get("BBDumpPort", &iBBDumpPort, -1); - core->Get("SyncGPU", &bSyncGPU, false); - core->Get("SyncGpuMaxDistance", &iSyncGpuMaxDistance, 200000); - core->Get("SyncGpuMinDistance", &iSyncGpuMinDistance, -200000); - core->Get("SyncGpuOverclock", &fSyncGpuOverclock, 1.0f); - core->Get("FastDiscSpeed", &bFastDiscSpeed, false); - core->Get("LowDCBZHack", &bLowDCBZHack, false); - core->Get("FPRF", &bFPRF, false); - core->Get("AccurateNaNs", &bAccurateNaNs, false); - core->Get("EmulationSpeed", &m_EmulationSpeed, 1.0f); - core->Get("Overclock", &m_OCFactor, 1.0f); - core->Get("OverclockEnable", &m_OCEnable, false); - core->Get("GPUDeterminismMode", &m_strGPUDeterminismMode, "auto"); - core->Get("PerfMapDir", &m_perfDir, ""); - core->Get("EnableCustomRTC", &bEnableCustomRTC, false); - // Default to seconds between 1.1.1970 and 1.1.2000 - core->Get("CustomRTCValue", &m_customRTCValue, 946684800); -} - -void SConfig::LoadMovieSettings(IniFile& ini) -{ - IniFile::Section* movie = ini.GetOrCreateSection("Movie"); - - movie->Get("PauseMovie", &m_PauseMovie, false); - movie->Get("Author", &m_strMovieAuthor, ""); - movie->Get("DumpFrames", &m_DumpFrames, false); - movie->Get("DumpFramesSilent", &m_DumpFramesSilent, false); - movie->Get("ShowInputDisplay", &m_ShowInputDisplay, false); - movie->Get("ShowRTC", &m_ShowRTC, false); -} - -void SConfig::LoadDSPSettings(IniFile& ini) -{ - IniFile::Section* dsp = ini.GetOrCreateSection("DSP"); - - dsp->Get("EnableJIT", &m_DSPEnableJIT, true); - dsp->Get("DumpAudio", &m_DumpAudio, false); - dsp->Get("DumpAudioSilent", &m_DumpAudioSilent, false); - dsp->Get("DumpUCode", &m_DumpUCode, false); - dsp->Get("Backend", &sBackend, AudioCommon::GetDefaultSoundBackend()); - dsp->Get("Volume", &m_Volume, 100); - dsp->Get("CaptureLog", &m_DSPCaptureLog, false); - -#ifdef _WIN32 - dsp->Get("WASAPIDevice", &sWASAPIDevice, "default"); -#endif - - m_IsMuted = false; -} - -void SConfig::LoadInputSettings(IniFile& ini) -{ - IniFile::Section* input = ini.GetOrCreateSection("Input"); - - input->Get("BackgroundInput", &m_BackgroundInput, false); -} - -void SConfig::LoadFifoPlayerSettings(IniFile& ini) -{ - IniFile::Section* fifoplayer = ini.GetOrCreateSection("FifoPlayer"); - - fifoplayer->Get("LoopReplay", &bLoopFifoReplay, true); -} - -void SConfig::LoadBluetoothPassthroughSettings(IniFile& ini) -{ - IniFile::Section* section = ini.GetOrCreateSection("BluetoothPassthrough"); - - section->Get("Enabled", &m_bt_passthrough_enabled, false); - section->Get("VID", &m_bt_passthrough_vid, -1); - section->Get("PID", &m_bt_passthrough_pid, -1); - section->Get("LinkKeys", &m_bt_passthrough_link_keys, ""); -} - -void SConfig::LoadUSBPassthroughSettings(IniFile& ini) -{ - IniFile::Section* section = ini.GetOrCreateSection("USBPassthrough"); - m_usb_passthrough_devices.clear(); - std::string devices_string; - section->Get("Devices", &devices_string, ""); - for (const auto& pair : SplitString(devices_string, ',')) - { - const auto index = pair.find(':'); - if (index == std::string::npos) - continue; - - const u16 vid = static_cast(strtol(pair.substr(0, index).c_str(), nullptr, 16)); - const u16 pid = static_cast(strtol(pair.substr(index + 1).c_str(), nullptr, 16)); - if (vid && pid) - m_usb_passthrough_devices.emplace(vid, pid); - } -} - -void SConfig::LoadAutoUpdateSettings(IniFile& ini) -{ - IniFile::Section* section = ini.GetOrCreateSection("AutoUpdate"); - - section->Get("UpdateTrack", &m_auto_update_track, SCM_UPDATE_TRACK_STR); - section->Get("HashOverride", &m_auto_update_hash_override, ""); -} - -void SConfig::LoadJitDebugSettings(IniFile& ini) -{ - IniFile::Section* section = ini.GetOrCreateSection("Debug"); - section->Get("JitOff", &bJITOff, false); - section->Get("JitLoadStoreOff", &bJITLoadStoreOff, false); - section->Get("JitLoadStoreFloatingOff", &bJITLoadStoreFloatingOff, false); - section->Get("JitLoadStorePairedOff", &bJITLoadStorePairedOff, false); - section->Get("JitFloatingPointOff", &bJITFloatingPointOff, false); - section->Get("JitIntegerOff", &bJITIntegerOff, false); - section->Get("JitPairedOff", &bJITPairedOff, false); - section->Get("JitSystemRegistersOff", &bJITSystemRegistersOff, false); - section->Get("JitBranchOff", &bJITBranchOff, false); - section->Get("JitRegisterCacheOff", &bJITRegisterCacheOff, false); + Config::Load(); } void SConfig::ResetRunningGameMetadata() @@ -711,67 +185,19 @@ void SConfig::SetRunningGameMetadata(const std::string& game_id, const std::stri HLE::Reload(); PatchEngine::Reload(); HiresTexture::Update(); - DolphinAnalytics::Instance().ReportGameStart(); } } void SConfig::LoadDefaults() { - bEnableDebugging = false; bAutomaticStart = false; bBootToPause = false; -#ifdef USE_GDBSTUB - iGDBPort = -1; -#ifndef _WIN32 - gdb_socket = ""; -#endif -#endif - - cpu_core = PowerPC::DefaultCPUCore(); - iTimingVariance = 40; - bCPUThread = false; - bSyncGPUOnSkipIdleHack = true; - bRunCompareServer = false; - bDSPHLE = true; - bFastmem = true; - bFPRF = false; - bAccurateNaNs = false; - bMMU = false; - bLowDCBZHack = false; - iBBDumpPort = -1; - bSyncGPU = false; - bFastDiscSpeed = false; - bEnableMemcardSdWriting = true; - SelectedLanguage = 0; - bOverrideRegionSettings = false; bWii = false; - bDPL2Decoder = false; - iLatency = 20; - m_audio_stretch = false; - m_audio_stretch_max_latency = 80; - - bLoopFifoReplay = true; - - bJITOff = false; // debugger only settings - bJITLoadStoreOff = false; - bJITLoadStoreFloatingOff = false; - bJITLoadStorePairedOff = false; - bJITFloatingPointOff = false; - bJITIntegerOff = false; - bJITPairedOff = false; - bJITSystemRegistersOff = false; - bJITBranchOff = false; - bJITRegisterCacheOff = false; ResetRunningGameMetadata(); } -bool SConfig::IsUSBDeviceWhitelisted(const std::pair vid_pid) const -{ - return m_usb_passthrough_devices.find(vid_pid) != m_usb_passthrough_devices.end(); -} - // The reason we need this function is because some memory card code // expects to get a non-NTSC-K region even if we're emulating an NTSC-K Wii. DiscIO::Region SConfig::ToGameCubeRegion(DiscIO::Region region) @@ -937,12 +363,11 @@ DiscIO::Region SConfig::GetFallbackRegion() DiscIO::Language SConfig::GetCurrentLanguage(bool wii) const { - int language_value; + DiscIO::Language language; if (wii) - language_value = Config::Get(Config::SYSCONF_LANGUAGE); + language = static_cast(Config::Get(Config::SYSCONF_LANGUAGE)); else - language_value = SConfig::GetInstance().SelectedLanguage + 1; - DiscIO::Language language = static_cast(language_value); + language = DiscIO::FromGameCubeLanguage(Config::Get(Config::MAIN_GC_LANGUAGE)); // Get rid of invalid values (probably doesn't matter, but might as well do it) if (language > DiscIO::Language::Unknown || language < DiscIO::Language::Japanese) @@ -960,7 +385,7 @@ DiscIO::Language SConfig::GetLanguageAdjustedForRegion(bool wii, DiscIO::Region if (!wii && region == DiscIO::Region::NTSC_J && language == DiscIO::Language::English) return DiscIO::Language::Japanese; // English and Japanese both use the value 0 in GC SRAM - if (!bOverrideRegionSettings) + if (!Config::Get(Config::MAIN_OVERRIDE_REGION_SETTINGS)) { if (region == DiscIO::Region::NTSC_J) return DiscIO::Language::Japanese; @@ -1025,7 +450,18 @@ IniFile SConfig::LoadGameIni(const std::string& id, std::optional revision) return game_ini; } -bool SConfig::ShouldUseDPL2Decoder() const +void SConfig::OnNewTitleLoad() { - return bDPL2Decoder && !bDSPHLE; + if (!Core::IsRunning()) + return; + + if (!g_symbolDB.IsEmpty()) + { + g_symbolDB.Clear(); + Host_NotifyMapLoaded(); + } + CBoot::LoadMapFromFilename(); + HLE::Reload(); + PatchEngine::Reload(); + HiresTexture::Update(); } diff --git a/Compatibility/Core/JitARCH.cpp b/Compatibility/Core/JitARCH.cpp new file mode 100644 index 000000000..ecc5616db --- /dev/null +++ b/Compatibility/Core/JitARCH.cpp @@ -0,0 +1,59 @@ +// Copyright (c) 2022, OpenEmu Team +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// * Neither the name of the OpenEmu Team nor the +// names of its contributors may be used to endorse or promote products +// derived from this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY OpenEmu Team ''AS IS'' AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +// DISCLAIMED. IN NO EVENT SHALL OpenEmu Team BE LIABLE FOR ANY +// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#ifdef __x86_64__ +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64/Jit.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64/Jit64_Tables.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64Common/BlockCache.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64Common/ConstantPool.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64Common/FarCodeCache.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp" +#elif defined(__arm64__) +#include "../../dolphin/Source/Core/Core/PowerPC/JitArm64/Jit_Util.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/JitArm64/Jit.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/JitArm64/JitArm64_Branch.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp" +#include "../../dolphin/Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp" +#endif diff --git a/Compatibility/Input/ControllerInterface.cpp b/Compatibility/Input/ControllerInterface.cpp index 11d0cd65e..2e87158a7 100644 --- a/Compatibility/Input/ControllerInterface.cpp +++ b/Compatibility/Input/ControllerInterface.cpp @@ -44,6 +44,7 @@ #endif ControllerInterface g_controller_interface; +static bool m_is_populating_devices = false; void ControllerInterface::Initialize(const WindowSystemInfo& wsi) { @@ -93,7 +94,34 @@ void ControllerInterface::Initialize(const WindowSystemInfo& wsi) m_is_populating_devices = false; } -void ControllerInterface::ChangeWindow(void* hwnd) +static thread_local ciface::InputChannel tls_input_channel = ciface::InputChannel::Host; + +void ControllerInterface::SetCurrentInputChannel(ciface::InputChannel input_channel) +{ + tls_input_channel = input_channel; +} + +ciface::InputChannel ControllerInterface::GetCurrentInputChannel() +{ + return tls_input_channel; +} + +void ControllerInterface::PlatformPopulateDevices(std::function callback) +{ + if (!m_is_init) + return; + + std::lock_guard lk_population(m_devices_population_mutex); + + m_populating_devices_counter.fetch_add(1); + + callback(); + + if (m_populating_devices_counter.fetch_sub(1) == 1) + InvokeDevicesChangedCallbacks(); +} + +void ControllerInterface::ChangeWindow(void* hwnd, WindowChangeReason reason) { if (!m_is_init) return; @@ -103,7 +131,7 @@ void ControllerInterface::ChangeWindow(void* hwnd) RefreshDevices(); } -void ControllerInterface::RefreshDevices() +void ControllerInterface::RefreshDevices(RefreshReason reason) { if (!m_is_init) return; @@ -205,11 +233,11 @@ void ControllerInterface::Shutdown() #endif } -void ControllerInterface::AddDevice(std::shared_ptr device) +bool ControllerInterface::AddDevice(std::shared_ptr device) { // If we are shutdown (or in process of shutting down) ignore this request: if (!m_is_init) - return; + return false; { std::lock_guard lk(m_devices_mutex); @@ -243,9 +271,10 @@ void ControllerInterface::AddDevice(std::shared_ptr device if (!m_is_populating_devices) InvokeDevicesChangedCallbacks(); + return true; } -void ControllerInterface::RemoveDevice(std::function callback) +void ControllerInterface::RemoveDevice(std::function callback, bool force_devices_release) { { std::lock_guard lk(m_devices_mutex); diff --git a/Compatibility/Input/InputConfig.cpp b/Compatibility/Input/InputConfig.cpp index 4d449fead..177c0ef26 100644 --- a/Compatibility/Input/InputConfig.cpp +++ b/Compatibility/Input/InputConfig.cpp @@ -26,7 +26,7 @@ InputConfig::InputConfig(const std::string& ini_name, const std::string& gui_nam InputConfig::~InputConfig() = default; -bool InputConfig::LoadConfig(bool isGC) +bool InputConfig::LoadConfig(InputClass type) { //OpenEmu Stub return false; @@ -45,7 +45,7 @@ void InputConfig::SaveConfig() inifile.Save(ini_filename); } -ControllerEmu::EmulatedController* InputConfig::GetController(int index) +ControllerEmu::EmulatedController* InputConfig::GetController(int index) const { return m_controllers.at(index).get(); } @@ -60,9 +60,9 @@ bool InputConfig::ControllersNeedToBeCreated() const return m_controllers.empty(); } -std::size_t InputConfig::GetControllerCount() const +int InputConfig::GetControllerCount() const { - return m_controllers.size(); + return static_cast(m_controllers.size()); } void InputConfig::RegisterHotplugCallback() @@ -80,11 +80,6 @@ void InputConfig::UnregisterHotplugCallback() g_controller_interface.UnregisterDevicesChangedCallback(m_hotplug_callback_handle); } -void InputConfig::OnControllerCreated(ControllerEmu::EmulatedController& controller) -{ - controller.SetDynamicInputTextureManager(&m_dynamic_input_tex_config_manager); -} - bool InputConfig::IsControllerControlledByGamepadDevice(int index) const { if (static_cast(index) >= m_controllers.size()) diff --git a/Compatibility/Input/OpenEmuController.mm b/Compatibility/Input/OpenEmuController.mm index 4ac7fbfbc..c49101365 100755 --- a/Compatibility/Input/OpenEmuController.mm +++ b/Compatibility/Input/OpenEmuController.mm @@ -4,6 +4,8 @@ #include "OpenEmuController.h" #include "Core/ConfigManager.h" +#include "Common/Config/Config.h" +#include "Core/Config/MainSettings.h" void input_poll_f() { @@ -14,7 +16,7 @@ void input_poll_f() int16_t input_state_f(unsigned port, unsigned device, unsigned index, unsigned button) { - if (SConfig::GetInstance().bWii && !SConfig::GetInstance().m_bt_passthrough_enabled) + if (SConfig::GetInstance().bWii && !Config::Get(Config::MAIN_BLUETOOTH_PASSTHROUGH_ENABLED)) { //This is where we must translate the OpenEmu frontend keys presses stored in the keymap to bitmasks for Dolphin. return WiiRemotes[port].wiimote_keymap[button].value; diff --git a/Compatibility/Input/OpenEmuInput.cpp b/Compatibility/Input/OpenEmuInput.cpp index c01f1e9fd..08d469ad6 100755 --- a/Compatibility/Input/OpenEmuInput.cpp +++ b/Compatibility/Input/OpenEmuInput.cpp @@ -5,6 +5,9 @@ #include "Common/Common.h" #include "Common/CommonTypes.h" #include "Common/IniFile.h" +#include "Common/Config/Config.h" +#include "Core/Config/MainSettings.h" +#include "Core/Config/WiimoteSettings.h" #include "Core/ConfigManager.h" #include "Core/HW/GCKeyboard.h" #include "Core/HW/GCPad.h" @@ -273,7 +276,7 @@ static bool init_wiimotes = false; Pad::Initialize(); Keyboard::Initialize(); - if (SConfig::GetInstance().bWii && !SConfig::GetInstance().m_bt_passthrough_enabled) + if (SConfig::GetInstance().bWii && !Config::Get(Config::MAIN_BLUETOOTH_PASSTHROUGH_ENABLED)) { init_wiimotes = true; Wiimote::Initialize(Wiimote::InitializeMode::DO_NOT_WAIT_FOR_WIIMOTES); @@ -371,7 +374,7 @@ void Input::openemu_set_controller_port_device(unsigned port, unsigned device) gcPad->UpdateReferences(g_controller_interface); Pad::GetConfig()->SaveConfig(); - if (SConfig::GetInstance().bWii && !SConfig::GetInstance().m_bt_passthrough_enabled) + if (SConfig::GetInstance().bWii && !Config::Get(Config::MAIN_BLUETOOTH_PASSTHROUGH_ENABLED)) { WiimoteEmu::Wiimote* wm = (WiimoteEmu::Wiimote*)Wiimote::GetConfig()->GetController(port); // load an empty inifile section, clears everything @@ -506,34 +509,34 @@ void Input::openemu_set_controller_port_device(unsigned port, unsigned device) { case OEWiimote: wmExtension->SetSelectedAttachment(ExtensionNumber::NONE); - WiimoteCommon::SetSource(port, WiimoteSource::Emulated); + Config::SetCurrent(Config::GetInfoForWiimoteSource(port), WiimoteSource::Emulated); break; case OEWiimoteSW: wmExtension->SetSelectedAttachment(ExtensionNumber::NONE); static_cast*>(wmOptions->numeric_settings[2].get()) ->SetValue(true); // Sideways Wiimote - WiimoteCommon::SetSource(port, WiimoteSource::Emulated); + Config::SetCurrent(Config::GetInfoForWiimoteSource(port), WiimoteSource::Emulated); break; case OEWiimoteNC: wmExtension->SetSelectedAttachment(ExtensionNumber::NUNCHUK); - WiimoteCommon::SetSource(port, WiimoteSource::Emulated); + Config::SetCurrent(Config::GetInfoForWiimoteSource(port), WiimoteSource::Emulated); break; case OEWiimoteCC: case OEWiimoteCC_Pro: wmExtension->SetSelectedAttachment(ExtensionNumber::CLASSIC); - WiimoteCommon::SetSource(port, WiimoteSource::Emulated); + Config::SetCurrent(Config::GetInfoForWiimoteSource(port), WiimoteSource::Emulated); break; case OEWiiMoteReal: //desc = Libretro::Input::descEmpty; - WiimoteCommon::SetSource(port, WiimoteSource::Real); + Config::SetCurrent(Config::GetInfoForWiimoteSource(port), WiimoteSource::Real); default: //desc = Libretro::Input::descGC; - WiimoteCommon::SetSource(port, WiimoteSource::None); + Config::SetCurrent(Config::GetInfoForWiimoteSource(port), WiimoteSource::None); break; } wm->UpdateReferences(g_controller_interface); diff --git a/Compatibility/Video/Render.cpp b/Compatibility/Video/OGLRender.cpp similarity index 88% rename from Compatibility/Video/Render.cpp rename to Compatibility/Video/OGLRender.cpp index 1ac9e0b21..62b3bea27 100644 --- a/Compatibility/Video/Render.cpp +++ b/Compatibility/Video/OGLRender.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "VideoBackends/OGL/Render.h" +#include "VideoBackends/OGL/OGLRender.h" #include #include @@ -11,7 +11,6 @@ #include #include -#include "Common/Atomic.h" #include "Common/CommonTypes.h" #include "Common/GL/GLContext.h" #include "Common/GL/GLUtil.h" @@ -22,13 +21,13 @@ #include "Core/Config/GraphicsSettings.h" -#include "VideoBackends/OGL/BoundingBox.h" +#include "VideoBackends/OGL/OGLBoundingBox.h" #include "VideoBackends/OGL/OGLPipeline.h" #include "VideoBackends/OGL/OGLShader.h" #include "VideoBackends/OGL/OGLTexture.h" #include "VideoBackends/OGL/ProgramShaderCache.h" #include "VideoBackends/OGL/SamplerCache.h" -#include "VideoBackends/OGL/VertexManager.h" +#include "VideoBackends/OGL/OGLVertexManager.h" #include "VideoCommon/BPFunctions.h" #include "VideoCommon/DriverDetails.h" @@ -335,11 +334,10 @@ Renderer::Renderer(std::unique_ptr main_gl_context, float backbuffer_ // Create the window framebuffer. if (!m_main_gl_context->IsHeadless()) { - //OpenEmu Framebuffer attaches here m_system_framebuffer = std::make_unique( nullptr, nullptr, AbstractTextureFormat::RGBA8, AbstractTextureFormat::Undefined, std::max(m_main_gl_context->GetBackBufferWidth(), 1u), - std::max(m_main_gl_context->GetBackBufferHeight(), 1u), 1, 1, g_Config.iRenderFBO); + std::max(m_main_gl_context->GetBackBufferHeight(), 1u), 1, 1, 0); m_current_framebuffer = m_system_framebuffer.get(); } @@ -358,8 +356,8 @@ Renderer::Renderer(std::unique_ptr main_gl_context, float backbuffer_ { // We want the ogl3 framebuffer instead of the ogl2 one for better blitting support. // It's also compatible with the gles3 one. - PanicAlert("GPU: ERROR: Need GL_ARB_framebuffer_object for multiple render targets.\n" - "GPU: Does your video card support OpenGL 3.0?"); + PanicAlertFmtT("GPU: ERROR: Need GL_ARB_framebuffer_object for multiple render targets.\n" + "GPU: Does your video card support OpenGL 3.0?"); bSuccess = false; } @@ -367,8 +365,8 @@ Renderer::Renderer(std::unique_ptr main_gl_context, float backbuffer_ { // This extension is used to replace lots of pointer setting function. // Also gles3 requires to use it. - PanicAlert("GPU: OGL ERROR: Need GL_ARB_vertex_array_object.\n" - "GPU: Does your video card support OpenGL 3.0?"); + PanicAlertFmtT("GPU: OGL ERROR: Need GL_ARB_vertex_array_object.\n" + "GPU: Does your video card support OpenGL 3.0?"); bSuccess = false; } @@ -376,8 +374,8 @@ Renderer::Renderer(std::unique_ptr main_gl_context, float backbuffer_ { // ogl3 buffer mapping for better streaming support. // The ogl2 one also isn't in gles3. - PanicAlert("GPU: OGL ERROR: Need GL_ARB_map_buffer_range.\n" - "GPU: Does your video card support OpenGL 3.0?"); + PanicAlertFmtT("GPU: OGL ERROR: Need GL_ARB_map_buffer_range.\n" + "GPU: Does your video card support OpenGL 3.0?"); bSuccess = false; } @@ -385,13 +383,13 @@ Renderer::Renderer(std::unique_ptr main_gl_context, float backbuffer_ { // ubo allow us to keep the current constants on shader switches // we also can stream them much nicer and pack into it whatever we want to - PanicAlert("GPU: OGL ERROR: Need GL_ARB_uniform_buffer_object.\n" - "GPU: Does your video card support OpenGL 3.1?"); + PanicAlertFmtT("GPU: OGL ERROR: Need GL_ARB_uniform_buffer_object.\n" + "GPU: Does your video card support OpenGL 3.1?"); bSuccess = false; } else if (DriverDetails::HasBug(DriverDetails::BUG_BROKEN_UBO)) { - PanicAlert( + PanicAlertFmtT( "Buggy GPU driver detected.\n" "Please either install the closed-source GPU driver or update your Mesa 3D version."); bSuccess = false; @@ -401,8 +399,8 @@ Renderer::Renderer(std::unique_ptr main_gl_context, float backbuffer_ { // Our sampler cache uses this extension. It could easyly be workaround and it's by far the // highest requirement, but it seems that no driver lacks support for it. - PanicAlert("GPU: OGL ERROR: Need GL_ARB_sampler_objects.\n" - "GPU: Does your video card support OpenGL 3.3?"); + PanicAlertFmtT("GPU: OGL ERROR: Need GL_ARB_sampler_objects.\n" + "GPU: Does your video card support OpenGL 3.3?"); bSuccess = false; } @@ -427,7 +425,6 @@ Renderer::Renderer(std::unique_ptr main_gl_context, float backbuffer_ ((GLExtensions::Version() >= 310) || GLExtensions::Supports("GL_NV_primitive_restart")); g_Config.backend_info.bSupportsFragmentStoresAndAtomics = GLExtensions::Supports("GL_ARB_shader_storage_buffer_object"); - g_Config.backend_info.bSupportsBBox = g_Config.backend_info.bSupportsFragmentStoresAndAtomics; g_Config.backend_info.bSupportsGSInstancing = GLExtensions::Supports("GL_ARB_gpu_shader5"); g_Config.backend_info.bSupportsSSAA = GLExtensions::Supports("GL_ARB_gpu_shader5") && GLExtensions::Supports("GL_ARB_sample_shading"); @@ -487,20 +484,21 @@ Renderer::Renderer(std::unique_ptr main_gl_context, float backbuffer_ GLExtensions::Supports("GL_EXT_texture_compression_s3tc"); g_Config.backend_info.bSupportsBPTCTextures = GLExtensions::Supports("GL_ARB_texture_compression_bptc"); + g_Config.backend_info.bSupportsCoarseDerivatives = + GLExtensions::Supports("GL_ARB_derivative_control") || GLExtensions::Version() >= 450; + g_Config.backend_info.bSupportsTextureQueryLevels = + GLExtensions::Supports("GL_ARB_texture_query_levels") || GLExtensions::Version() >= 430; if (m_main_gl_context->IsGLES()) { - g_ogl_config.SupportedESPointSize = - GLExtensions::Supports("GL_OES_geometry_point_size") ? - 1 : - GLExtensions::Supports("GL_EXT_geometry_point_size") ? 2 : 0; - g_ogl_config.SupportedESTextureBuffer = GLExtensions::Supports("VERSION_GLES_3_2") ? - EsTexbufType::TexbufCore : - GLExtensions::Supports("GL_OES_texture_buffer") ? - EsTexbufType::TexbufOes : - GLExtensions::Supports("GL_EXT_texture_buffer") ? - EsTexbufType::TexbufExt : - EsTexbufType::TexbufNone; + g_ogl_config.SupportedESPointSize = GLExtensions::Supports("GL_OES_geometry_point_size") ? 1 : + GLExtensions::Supports("GL_EXT_geometry_point_size") ? 2 : + 0; + g_ogl_config.SupportedESTextureBuffer = + GLExtensions::Supports("VERSION_GLES_3_2") ? EsTexbufType::TexbufCore : + GLExtensions::Supports("GL_OES_texture_buffer") ? EsTexbufType::TexbufOes : + GLExtensions::Supports("GL_EXT_texture_buffer") ? EsTexbufType::TexbufExt : + EsTexbufType::TexbufNone; supports_glsl_cache = true; g_ogl_config.bSupportsGLSync = true; @@ -516,6 +514,9 @@ Renderer::Renderer(std::unique_ptr main_gl_context, float backbuffer_ // ARB_get_texture_sub_image (unlikely, except maybe on NVIDIA), we can use that instead. g_Config.backend_info.bSupportsDepthReadback = g_ogl_config.bSupportsTextureSubImage; + // GL_TEXTURE_LOD_BIAS is not supported on GLES. + g_Config.backend_info.bSupportsLodBiasInSampler = false; + if (GLExtensions::Supports("GL_EXT_shader_framebuffer_fetch")) { g_ogl_config.SupportedFramebufferFetch = EsFbFetchType::FbFetchExt; @@ -584,16 +585,17 @@ Renderer::Renderer(std::unique_ptr main_gl_context, float backbuffer_ g_ogl_config.bSupports3DTextureStorageMultisample = true; g_Config.backend_info.bSupportsBitfield = true; g_Config.backend_info.bSupportsDynamicSamplerIndexing = true; + g_Config.backend_info.bSupportsSettingObjectNames = true; } } else { if (GLExtensions::Version() < 300) { - PanicAlert("GPU: OGL ERROR: Need at least GLSL 1.30\n" - "GPU: Does your video card support OpenGL 3.0?\n" - "GPU: Your driver supports GLSL %s", - (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION)); + PanicAlertFmtT("GPU: OGL ERROR: Need at least GLSL 1.30\n" + "GPU: Does your video card support OpenGL 3.0?\n" + "GPU: Your driver supports GLSL {0}", + reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION))); bSuccess = false; } else if (GLExtensions::Version() == 300) @@ -629,6 +631,7 @@ Renderer::Renderer(std::unique_ptr main_gl_context, float backbuffer_ g_ogl_config.bSupportsTextureStorage = true; g_ogl_config.bSupportsImageLoadStore = true; g_Config.backend_info.bSupportsSSAA = true; + g_Config.backend_info.bSupportsSettingObjectNames = true; // Compute shaders are core in GL4.3. g_Config.backend_info.bSupportsComputeShaders = true; @@ -656,6 +659,8 @@ Renderer::Renderer(std::unique_ptr main_gl_context, float backbuffer_ glEnable(GL_PROGRAM_POINT_SIZE); } + g_Config.backend_info.bSupportsBBox = g_Config.backend_info.bSupportsFragmentStoresAndAtomics; + // Either method can do early-z tests. See PixelShaderGen for details. g_Config.backend_info.bSupportsEarlyZ = g_ogl_config.bSupportsImageLoadStore || g_ogl_config.bSupportsConservativeDepth; @@ -700,8 +705,8 @@ Renderer::Renderer(std::unique_ptr main_gl_context, float backbuffer_ glDebugMessageControlARB(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, nullptr, true); glDebugMessageCallbackARB(ErrorCallback, nullptr); } - if (Common::Log::LogManager::GetInstance()->IsEnabled(Common::Log::HOST_GPU, - Common::Log::LERROR)) + if (Common::Log::LogManager::GetInstance()->IsEnabled(Common::Log::LogType::HOST_GPU, + Common::Log::LogLevel::LERROR)) { glEnable(GL_DEBUG_OUTPUT); } @@ -718,10 +723,11 @@ Renderer::Renderer(std::unique_ptr main_gl_context, float backbuffer_ // MSAA on default framebuffer isn't working because of glBlitFramebuffer. // It also isn't useful as we don't render anything to the default framebuffer. // We also try to get a non-msaa fb, so this only happens when forced by the driver. - PanicAlertT("The graphics driver is forcibly enabling anti-aliasing for Dolphin. You need to " - "turn this off in the graphics driver's settings in order for Dolphin to work.\n\n" - "(MSAA with %d samples found on default framebuffer)", - samples); + PanicAlertFmtT( + "The graphics driver is forcibly enabling anti-aliasing for Dolphin. You need to " + "turn this off in the graphics driver's settings in order for Dolphin to work.\n\n" + "(MSAA with {0} samples found on default framebuffer)", + samples); bSuccess = false; } @@ -735,33 +741,35 @@ Renderer::Renderer(std::unique_ptr main_gl_context, float backbuffer_ g_Config.VerifyValidity(); UpdateActiveConfig(); - OSD::AddMessage(StringFromFormat("Video Info: %s, %s, %s", g_ogl_config.gl_vendor, - g_ogl_config.gl_renderer, g_ogl_config.gl_version), + OSD::AddMessage(fmt::format("Video Info: {}, {}, {}", g_ogl_config.gl_vendor, + g_ogl_config.gl_renderer, g_ogl_config.gl_version), 5000); if (!g_ogl_config.bSupportsGLBufferStorage && !g_ogl_config.bSupportsGLPinnedMemory) { - OSD::AddMessage(StringFromFormat("Your OpenGL driver does not support %s_buffer_storage.", - m_main_gl_context->IsGLES() ? "EXT" : "ARB"), + OSD::AddMessage(fmt::format("Your OpenGL driver does not support {}_buffer_storage.", + m_main_gl_context->IsGLES() ? "EXT" : "ARB"), 60000); - OSD::AddMessage("This device's performance will be terrible.", 60000); - OSD::AddMessage("Please ask your device vendor for an updated OpenGL driver.", 60000); + OSD::AddMessage("This device's performance may be poor.", 60000); } - WARN_LOG(VIDEO, "Missing OGL Extensions: %s%s%s%s%s%s%s%s%s%s%s%s%s%s", - g_ActiveConfig.backend_info.bSupportsDualSourceBlend ? "" : "DualSourceBlend ", - g_ActiveConfig.backend_info.bSupportsPrimitiveRestart ? "" : "PrimitiveRestart ", - g_ActiveConfig.backend_info.bSupportsEarlyZ ? "" : "EarlyZ ", - g_ogl_config.bSupportsGLPinnedMemory ? "" : "PinnedMemory ", - supports_glsl_cache ? "" : "ShaderCache ", - g_ogl_config.bSupportsGLBaseVertex ? "" : "BaseVertex ", - g_ogl_config.bSupportsGLBufferStorage ? "" : "BufferStorage ", - g_ogl_config.bSupportsGLSync ? "" : "Sync ", g_ogl_config.bSupportsMSAA ? "" : "MSAA ", - g_ActiveConfig.backend_info.bSupportsSSAA ? "" : "SSAA ", - g_ActiveConfig.backend_info.bSupportsGSInstancing ? "" : "GSInstancing ", - g_ActiveConfig.backend_info.bSupportsClipControl ? "" : "ClipControl ", - g_ogl_config.bSupportsCopySubImage ? "" : "CopyImageSubData ", - g_ActiveConfig.backend_info.bSupportsDepthClamp ? "" : "DepthClamp "); + INFO_LOG_FMT(VIDEO, "Video Info: {}, {}, {}", g_ogl_config.gl_vendor, g_ogl_config.gl_renderer, + g_ogl_config.gl_version); + WARN_LOG_FMT(VIDEO, "Missing OGL Extensions: {}{}{}{}{}{}{}{}{}{}{}{}{}{}", + g_ActiveConfig.backend_info.bSupportsDualSourceBlend ? "" : "DualSourceBlend ", + g_ActiveConfig.backend_info.bSupportsPrimitiveRestart ? "" : "PrimitiveRestart ", + g_ActiveConfig.backend_info.bSupportsEarlyZ ? "" : "EarlyZ ", + g_ogl_config.bSupportsGLPinnedMemory ? "" : "PinnedMemory ", + supports_glsl_cache ? "" : "ShaderCache ", + g_ogl_config.bSupportsGLBaseVertex ? "" : "BaseVertex ", + g_ogl_config.bSupportsGLBufferStorage ? "" : "BufferStorage ", + g_ogl_config.bSupportsGLSync ? "" : "Sync ", + g_ogl_config.bSupportsMSAA ? "" : "MSAA ", + g_ActiveConfig.backend_info.bSupportsSSAA ? "" : "SSAA ", + g_ActiveConfig.backend_info.bSupportsGSInstancing ? "" : "GSInstancing ", + g_ActiveConfig.backend_info.bSupportsClipControl ? "" : "ClipControl ", + g_ogl_config.bSupportsCopySubImage ? "" : "CopyImageSubData ", + g_ActiveConfig.backend_info.bSupportsDepthClamp ? "" : "DepthClamp "); // Handle VSync on/off if (!DriverDetails::HasBug(DriverDetails::BUG_BROKEN_VSYNC)) @@ -811,9 +819,10 @@ void Renderer::Shutdown() glDeleteFramebuffers(1, &m_shared_read_framebuffer); } -std::unique_ptr Renderer::CreateTexture(const TextureConfig& config) +std::unique_ptr Renderer::CreateTexture(const TextureConfig& config, + std::string_view name) { - return std::make_unique(config); + return std::make_unique(config, name); } std::unique_ptr Renderer::CreateStagingTexture(StagingTextureType type, @@ -830,13 +839,15 @@ std::unique_ptr Renderer::CreateFramebuffer(AbstractTexture } std::unique_ptr Renderer::CreateShaderFromSource(ShaderStage stage, - std::string_view source) + std::string_view source, + std::string_view name) { - return OGLShader::CreateFromSource(stage, source); + return OGLShader::CreateFromSource(stage, source, name); } std::unique_ptr Renderer::CreateShaderFromBinary(ShaderStage stage, - const void* data, size_t length) + const void* data, size_t length, + std::string_view name) { return nullptr; } @@ -853,32 +864,9 @@ void Renderer::SetScissorRect(const MathUtil::Rectangle& rc) glScissor(rc.left, rc.top, rc.GetWidth(), rc.GetHeight()); } -u16 Renderer::BBoxRead(int index) +std::unique_ptr<::BoundingBox> Renderer::CreateBoundingBox() const { - // swap 2 and 3 for top/bottom - if (index >= 2) - index ^= 1; - - int value = BoundingBox::Get(index); - if (index >= 2) - { - // up/down -- we have to swap up and down - value = EFB_HEIGHT - value; - } - - return static_cast(value); -} - -void Renderer::BBoxWrite(int index, u16 value) -{ - s32 swapped_value = value; - if (index >= 2) - { - index ^= 1; // swap 2 and 3 for top/bottom - swapped_value = EFB_HEIGHT - swapped_value; - } - - BoundingBox::Set(index, swapped_value); + return std::make_unique(); } void Renderer::SetViewport(float x, float y, float width, float height, float near_depth, @@ -1051,8 +1039,8 @@ void Renderer::PresentBackbuffer() { if (g_ogl_config.bSupportsDebug) { - if (Common::Log::LogManager::GetInstance()->IsEnabled(Common::Log::HOST_GPU, - Common::Log::LERROR)) + if (Common::Log::LogManager::GetInstance()->IsEnabled(Common::Log::LogType::HOST_GPU, + Common::Log::LogLevel::LERROR)) { glEnable(GL_DEBUG_OUTPUT); } @@ -1138,11 +1126,11 @@ void Renderer::ApplyRasterizationState(const RasterizationState state) return; // none, ccw, cw, ccw - if (state.cullmode != GenMode::CULL_NONE) + if (state.cullmode != CullMode::None) { // TODO: GX_CULL_ALL not supported, yet! glEnable(GL_CULL_FACE); - glFrontFace(state.cullmode == GenMode::CULL_FRONT ? GL_CCW : GL_CW); + glFrontFace(state.cullmode == CullMode::Front ? GL_CCW : GL_CW); } else { @@ -1164,7 +1152,7 @@ void Renderer::ApplyDepthState(const DepthState state) { glEnable(GL_DEPTH_TEST); glDepthMask(state.updateenable ? GL_TRUE : GL_FALSE); - glDepthFunc(glCmpFuncs[state.func]); + glDepthFunc(glCmpFuncs[u32(state.func.Value())]); } else { @@ -1227,8 +1215,10 @@ void Renderer::ApplyBlendingState(const BlendingState state) GLenum equation = state.subtract ? GL_FUNC_REVERSE_SUBTRACT : GL_FUNC_ADD; GLenum equationAlpha = state.subtractAlpha ? GL_FUNC_REVERSE_SUBTRACT : GL_FUNC_ADD; glBlendEquationSeparate(equation, equationAlpha); - glBlendFuncSeparate(src_factors[state.srcfactor], dst_factors[state.dstfactor], - src_factors[state.srcfactoralpha], dst_factors[state.dstfactoralpha]); + glBlendFuncSeparate(src_factors[u32(state.srcfactor.Value())], + dst_factors[u32(state.dstfactor.Value())], + src_factors[u32(state.srcfactoralpha.Value())], + dst_factors[u32(state.dstfactoralpha.Value())]); } const GLenum logic_op_codes[16] = { @@ -1242,7 +1232,7 @@ void Renderer::ApplyBlendingState(const BlendingState state) if (state.logicopenable) { glEnable(GL_COLOR_LOGIC_OP); - glLogicOp(logic_op_codes[state.logicmode]); + glLogicOp(logic_op_codes[u32(state.logicmode.Value())]); } else { diff --git a/Compatibility/VideoCommon/VideoConfig.h b/Compatibility/VideoCommon/VideoConfig.h index 93b5e4c04..c00044e91 100644 --- a/Compatibility/VideoCommon/VideoConfig.h +++ b/Compatibility/VideoCommon/VideoConfig.h @@ -16,6 +16,7 @@ #include #include "Common/CommonTypes.h" +#include "VideoCommon/VideoCommon.h" enum class APIType; @@ -56,7 +57,7 @@ enum class ShaderCompilationMode : int // NEVER inherit from this class. struct VideoConfig final { - VideoConfig(); + VideoConfig() = default; void Refresh(); void VerifyValidity(); @@ -138,6 +139,8 @@ struct VideoConfig final bool bFastDepthCalc; bool bVertexRounding; int iEFBAccessTileSize; + u32 iMissingColorValue; + bool bFastTextureSampling; int iLog; // CONF_ bits int iSaveTargetId; // TODO: Should be dropped @@ -186,7 +189,7 @@ struct VideoConfig final // TODO: Move this out of VideoConfig struct { - APIType api_type; + APIType api_type = APIType::Nothing; std::vector Adapters; // for D3D std::vector AAModes; @@ -194,42 +197,47 @@ struct VideoConfig final // TODO: merge AdapterName and Adapters array std::string AdapterName; // for OpenGL - u32 MaxTextureSize; - bool bUsesLowerLeftOrigin; + u32 MaxTextureSize = 16384; + bool bUsesLowerLeftOrigin = false; - bool bSupportsExclusiveFullscreen; - bool bSupportsDualSourceBlend; - bool bSupportsPrimitiveRestart; - bool bSupportsOversizedViewports; - bool bSupportsGeometryShaders; - bool bSupportsComputeShaders; - bool bSupports3DVision; - bool bSupportsEarlyZ; // needed by PixelShaderGen, so must stay in VideoCommon - bool bSupportsBindingLayout; // Needed by ShaderGen, so must stay in VideoCommon - bool bSupportsBBox; - bool bSupportsGSInstancing; // Needed by GeometryShaderGen, so must stay in VideoCommon - bool bSupportsPostProcessing; - bool bSupportsPaletteConversion; - bool bSupportsClipControl; // Needed by VertexShaderGen, so must stay in VideoCommon - bool bSupportsSSAA; - bool bSupportsFragmentStoresAndAtomics; // a.k.a. OpenGL SSBOs a.k.a. Direct3D UAVs - bool bSupportsDepthClamp; // Needed by VertexShaderGen, so must stay in VideoCommon - bool bSupportsReversedDepthRange; - bool bSupportsLogicOp; - bool bSupportsMultithreading; - bool bSupportsGPUTextureDecoding; - bool bSupportsST3CTextures; - bool bSupportsCopyToVram; - bool bSupportsBitfield; // Needed by UberShaders, so must stay in VideoCommon - bool bSupportsDynamicSamplerIndexing; // Needed by UberShaders, so must stay in VideoCommon - bool bSupportsBPTCTextures; - bool bSupportsFramebufferFetch; // Used as an alternative to dual-source blend on GLES - bool bSupportsBackgroundCompiling; - bool bSupportsLargePoints; - bool bSupportsPartialDepthCopies; - bool bSupportsDepthReadback; - bool bSupportsShaderBinaries; - bool bSupportsPipelineCacheData; + bool bSupportsExclusiveFullscreen = false; + bool bSupportsDualSourceBlend = false; + bool bSupportsPrimitiveRestart = false; + bool bSupportsOversizedViewports = false; + bool bSupportsGeometryShaders = false; + bool bSupportsComputeShaders = false; + bool bSupports3DVision = false; + bool bSupportsEarlyZ = false; // needed by PixelShaderGen, so must stay in VideoCommon + bool bSupportsBindingLayout = false; // Needed by ShaderGen, so must stay in VideoCommon + bool bSupportsBBox = false; + bool bSupportsGSInstancing = false; // Needed by GeometryShaderGen, so must stay in VideoCommon + bool bSupportsPostProcessing = false; + bool bSupportsPaletteConversion = false; + bool bSupportsClipControl = false; // Needed by VertexShaderGen, so must stay in VideoCommon + bool bSupportsSSAA = false; + bool bSupportsFragmentStoresAndAtomics = false; // a.k.a. OpenGL SSBOs a.k.a. Direct3D UAVs + bool bSupportsDepthClamp = false; // Needed by VertexShaderGen, so must stay in VideoCommon + bool bSupportsReversedDepthRange = false; + bool bSupportsLogicOp = false; + bool bSupportsMultithreading = false; + bool bSupportsGPUTextureDecoding = false; + bool bSupportsST3CTextures = false; + bool bSupportsCopyToVram = false; + bool bSupportsBitfield = false; // Needed by UberShaders, so must stay in VideoCommon + // Needed by UberShaders, so must stay in VideoCommon + bool bSupportsDynamicSamplerIndexing = false; + bool bSupportsBPTCTextures = false; + bool bSupportsFramebufferFetch = false; // Used as an alternative to dual-source blend on GLES + bool bSupportsBackgroundCompiling = false; + bool bSupportsLargePoints = false; + bool bSupportsPartialDepthCopies = false; + bool bSupportsDepthReadback = false; + bool bSupportsShaderBinaries = false; + bool bSupportsPipelineCacheData = false; + bool bSupportsCoarseDerivatives = false; + bool bSupportsTextureQueryLevels = false; + bool bSupportsLodBiasInSampler = false; + bool bSupportsSettingObjectNames = false; } backend_info; // Utility @@ -243,6 +251,16 @@ struct VideoConfig final return backend_info.bSupportsGPUTextureDecoding && bEnableGPUTextureDecoding; } bool UseVertexRounding() const { return bVertexRounding && iEFBScale != 1; } + bool ManualTextureSamplingWithHiResTextures() const + { + // Hi-res textures (including hi-res EFB copies, but not native-resolution EFB copies at higher + // internal resolutions) breaks the wrapping logic used by manual texture sampling. + if (bFastTextureSampling) + return false; + if (iEFBScale != 1 && bCopyEFBScaled) + return true; + return bHiresTextures; + } bool UsingUberShaders() const; u32 GetShaderCompilerThreads() const; u32 GetShaderPrecompilerThreads() const; diff --git a/DolHost.h b/DolHost.h index c802487f0..974bb3adc 100755 --- a/DolHost.h +++ b/DolHost.h @@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "Core/ActionReplay.h" #include "Core/ARDecrypt.h" -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/CoreDevice.h" #include "DolphinNoGUI/Platform.h" diff --git a/DolHost.mm b/DolHost.mm index 1aa248d20..f61dc2762 100755 --- a/DolHost.mm +++ b/DolHost.mm @@ -44,10 +44,11 @@ #include "Common/Thread.h" #include "Common/Version.h" -#include "Core/Analytics.h" +#include "Core/DolphinAnalytics.h" #include "Core/Boot/Boot.h" #include "Core/BootManager.h" #include "Core/Config/MainSettings.h" +#include "Core/Config/WiimoteSettings.h" #include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/Host.h" @@ -78,6 +79,9 @@ #include "VideoCommon/OnScreenDisplay.h" #include "VideoBackends/OGL/ProgramShaderCache.h" +#include "Core/Config/MainSettings.h" +#include "Core/ConfigManager.h" + DolHost* DolHost::m_instance = nullptr; static Common::Event updateMainFrameEvent; static Common::Flag s_running{true}; @@ -111,33 +115,33 @@ void DolHost::Init(std::string supportDirectoryPath, std::string cpath) UICommon::Init(); // Database Settings - SConfig::GetInstance().m_use_builtin_title_database = true; + Config::SetBase(Config::MAIN_USE_BUILT_IN_TITLE_DATABASE, true); //Setup the CPU Settings - SConfig::GetInstance().bMMU = true; - SConfig::GetInstance().bEnableCheats = true; + Config::SetBase(Config::MAIN_MMU, true); + Config::SetBase(Config::MAIN_ENABLE_CHEATS, true); SConfig::GetInstance().bBootToPause = false; //Debug Settings - SConfig::GetInstance().bEnableDebugging = false; + Config::SetBase(Config::MAIN_ENABLE_DEBUGGING, false); #ifdef DEBUG Config::SetBase(Config::MAIN_OSD_MESSAGES, true); #else Config::SetBase(Config::MAIN_OSD_MESSAGES, false); #endif - SConfig::GetInstance().m_ShowFrameCount = false; + Config::SetBase(Config::MAIN_SHOW_FRAME_COUNT, false); //Video Config::SetBase(Config::MAIN_GFX_BACKEND, "OGL"); VideoBackendBase::ActivateBackend(Config::Get(Config::MAIN_GFX_BACKEND)); //Set the Sound - SConfig::GetInstance().bDSPHLE = true; - SConfig::GetInstance().bDSPThread = true; - SConfig::GetInstance().m_Volume = 0; + Config::SetBase(Config::MAIN_DSP_HLE, true); + Config::SetBase(Config::MAIN_DSP_THREAD, true); + Config::SetBase(Config::MAIN_AUDIO_VOLUME, 0); //Split CPU thread from GPU - SConfig::GetInstance().bCPUThread = true; + Config::SetBase(Config::MAIN_CPU_THREAD, true); //Analitics Config::SetBase(Config::MAIN_ANALYTICS_PERMISSION_ASKED, true); @@ -148,10 +152,10 @@ void DolHost::Init(std::string supportDirectoryPath, std::string cpath) SConfig::GetInstance().SaveSettings(); //Choose Wiimote Type - WiimoteCommon::SetSource(0, WiimoteSource::Emulated); - WiimoteCommon::SetSource(1, WiimoteSource::Emulated); - WiimoteCommon::SetSource(2, WiimoteSource::Emulated); - WiimoteCommon::SetSource(3, WiimoteSource::Emulated); + Config::SetCurrent(Config::GetInfoForWiimoteSource(0), WiimoteSource::Emulated); + Config::SetCurrent(Config::GetInfoForWiimoteSource(1), WiimoteSource::Emulated); + Config::SetCurrent(Config::GetInfoForWiimoteSource(2), WiimoteSource::Emulated); + Config::SetCurrent(Config::GetInfoForWiimoteSource(3), WiimoteSource::Emulated); //Get game info from file path GetGameInfo(); @@ -189,7 +193,7 @@ void DolHost::Init(std::string supportDirectoryPath, std::string cpath) // SConfig::GetInstance().m_enable_signature_checks = false; // Disable wiimote continuous scanning - SConfig::GetInstance().m_WiimoteContinuousScanning = false; + Config::SetBase(Config::MAIN_WIIMOTE_CONTINUOUS_SCANNING, false); //Set the Wiimote type // WiimoteReal::ChangeWiimoteSource(0, _wiiMoteType); @@ -202,7 +206,7 @@ void DolHost::Init(std::string supportDirectoryPath, std::string cpath) # pragma mark - Execution bool DolHost::LoadFileAtPath() { - Core::SetOnStateChangedCallback([](Core::State state) { + Core::AddOnStateChangedCallback([](Core::State state) { if (state == Core::State::Uninitialized) s_running.Clear(); }); @@ -291,7 +295,7 @@ void DolHost::SetBackBufferSize(int width, int height) { # pragma mark - Audio void DolHost::SetVolume(float value) { - SConfig::GetInstance().m_Volume = value * 100; + Config::SetBaseOrCurrent(Config::MAIN_AUDIO_VOLUME, value * 100); AudioCommon::UpdateSoundStream(); } @@ -612,13 +616,18 @@ void Host_RequestRenderWindowSize(int width, int height){} void Host_SetStartupDebuggingParameters() { SConfig& StartUp = SConfig::GetInstance(); - StartUp.bEnableDebugging = false; StartUp.bBootToPause = false; } +std::vector Host_GetPreferredLocales() +{ + return {}; +} + bool Host_UINeedsControllerState(){ return false; } bool Host_UIBlocksControllerState() { return false; } bool Host_RendererHasFocus() { return true; } +bool Host_RendererHasFullFocus() { return true; } bool Host_RendererIsFullscreen() { return false; } void Host_ShowVideoConfig(void*, const std::string&) {} void Host_YieldToUI() {} diff --git a/Info.plist b/Info.plist index d9ea62d71..d53068bba 100755 --- a/Info.plist +++ b/Info.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - English + en CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIconFile @@ -19,7 +19,7 @@ CFBundleSignature ???? CFBundleVersion - 5.0.13467 + $(CURRENT_PROJECT_VERSION) NSPrincipalClass OEGameCoreController OEGameCoreClass diff --git a/dolphin b/dolphin index 79a234eff..a4445fa1b 160000 --- a/dolphin +++ b/dolphin @@ -1 +1 @@ -Subproject commit 79a234eff728b2aeb68c9848f2e4fe861d4f3b91 +Subproject commit a4445fa1b0902f86e27793d365dc7d8ec449d3a2 diff --git a/dolphin.xcodeproj/project.pbxproj b/dolphin.xcodeproj/project.pbxproj index a38b9c59c..24142bf1d 100644 --- a/dolphin.xcodeproj/project.pbxproj +++ b/dolphin.xcodeproj/project.pbxproj @@ -141,7 +141,7 @@ 3E3D71791C82B0BB00091C4D /* ConsoleListenerNix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71261C82B0BB00091C4D /* ConsoleListenerNix.cpp */; }; 3E3D717B1C82B0BB00091C4D /* LogManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71291C82B0BB00091C4D /* LogManager.cpp */; }; 3E3D717C1C82B0BB00091C4D /* MathUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D712C1C82B0BB00091C4D /* MathUtil.cpp */; }; - 3E3D717D1C82B0BB00091C4D /* MemArena.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D712E1C82B0BB00091C4D /* MemArena.cpp */; }; + 3E3D717D1C82B0BB00091C4D /* MemArenaUnix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D712E1C82B0BB00091C4D /* MemArenaUnix.cpp */; }; 3E3D717E1C82B0BB00091C4D /* MemoryUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71301C82B0BB00091C4D /* MemoryUtil.cpp */; }; 3E3D71801C82B0BB00091C4D /* MsgHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71331C82B0BB00091C4D /* MsgHandler.cpp */; }; 3E3D71811C82B0BB00091C4D /* NandPaths.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71351C82B0BB00091C4D /* NandPaths.cpp */; }; @@ -184,11 +184,8 @@ 3E3D73761C82B0F900091C4D /* DSPTables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71DE1C82B0F800091C4D /* DSPTables.cpp */; }; 3E3D73801C82B0F900091C4D /* LabelMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71EB1C82B0F800091C4D /* LabelMap.cpp */; }; 3E3D73811C82B0F900091C4D /* DSPEmulator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71ED1C82B0F800091C4D /* DSPEmulator.cpp */; }; - 3E3D73831C82B0F900091C4D /* FifoAnalyzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71F21C82B0F800091C4D /* FifoAnalyzer.cpp */; }; 3E3D73841C82B0F900091C4D /* FifoDataFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71F41C82B0F800091C4D /* FifoDataFile.cpp */; }; - 3E3D73851C82B0F900091C4D /* FifoPlaybackAnalyzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71F71C82B0F800091C4D /* FifoPlaybackAnalyzer.cpp */; }; 3E3D73861C82B0F900091C4D /* FifoPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71F91C82B0F800091C4D /* FifoPlayer.cpp */; }; - 3E3D73871C82B0F900091C4D /* FifoRecordAnalyzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71FB1C82B0F800091C4D /* FifoRecordAnalyzer.cpp */; }; 3E3D73881C82B0F900091C4D /* FifoRecorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71FD1C82B0F800091C4D /* FifoRecorder.cpp */; }; 3E3D73891C82B0F900091C4D /* GeckoCode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D71FF1C82B0F800091C4D /* GeckoCode.cpp */; }; 3E3D738A1C82B0F900091C4D /* GeckoCodeConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72011C82B0F800091C4D /* GeckoCodeConfig.cpp */; }; @@ -211,7 +208,6 @@ 3E3D739E1C82B0F900091C4D /* Zelda.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D722F1C82B0F900091C4D /* Zelda.cpp */; }; 3E3D73A01C82B0F900091C4D /* DSPHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72341C82B0F900091C4D /* DSPHost.cpp */; }; 3E3D73A11C82B0F900091C4D /* DSPLLE.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72351C82B0F900091C4D /* DSPLLE.cpp */; }; - 3E3D73A21C82B0F900091C4D /* DSPLLEGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72371C82B0F900091C4D /* DSPLLEGlobals.cpp */; }; 3E3D73A41C82B0F900091C4D /* DSPSymbols.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D723B1C82B0F900091C4D /* DSPSymbols.cpp */; }; 3E3D73B21C82B0F900091C4D /* GCKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72571C82B0F900091C4D /* GCKeyboard.cpp */; }; 3E3D73B31C82B0F900091C4D /* GCKeyboardEmu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72591C82B0F900091C4D /* GCKeyboardEmu.cpp */; }; @@ -241,18 +237,6 @@ 3E3D73FD1C82B0F900091C4D /* Interpreter_Paired.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72F31C82B0F900091C4D /* Interpreter_Paired.cpp */; }; 3E3D73FE1C82B0F900091C4D /* Interpreter_SystemRegisters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72F41C82B0F900091C4D /* Interpreter_SystemRegisters.cpp */; }; 3E3D73FF1C82B0F900091C4D /* Interpreter_Tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72F51C82B0F900091C4D /* Interpreter_Tables.cpp */; }; - 3E3D74001C82B0F900091C4D /* Jit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72F81C82B0F900091C4D /* Jit.cpp */; }; - 3E3D74011C82B0F900091C4D /* Jit64_Tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72FA1C82B0F900091C4D /* Jit64_Tables.cpp */; }; - 3E3D74021C82B0F900091C4D /* Jit_Branch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72FC1C82B0F900091C4D /* Jit_Branch.cpp */; }; - 3E3D74031C82B0F900091C4D /* Jit_FloatingPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72FD1C82B0F900091C4D /* Jit_FloatingPoint.cpp */; }; - 3E3D74041C82B0F900091C4D /* Jit_Integer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72FE1C82B0F900091C4D /* Jit_Integer.cpp */; }; - 3E3D74051C82B0F900091C4D /* Jit_LoadStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72FF1C82B0F900091C4D /* Jit_LoadStore.cpp */; }; - 3E3D74061C82B0F900091C4D /* Jit_LoadStoreFloating.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D73001C82B0F900091C4D /* Jit_LoadStoreFloating.cpp */; }; - 3E3D74071C82B0F900091C4D /* Jit_LoadStorePaired.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D73011C82B0F900091C4D /* Jit_LoadStorePaired.cpp */; }; - 3E3D74081C82B0F900091C4D /* Jit_Paired.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D73021C82B0F900091C4D /* Jit_Paired.cpp */; }; - 3E3D74091C82B0F900091C4D /* Jit_SystemRegisters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D73031C82B0F900091C4D /* Jit_SystemRegisters.cpp */; }; - 3E3D740A1C82B0F900091C4D /* JitAsm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D73041C82B0F900091C4D /* JitAsm.cpp */; }; - 3E3D740C1C82B0F900091C4D /* Jit64AsmCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D73091C82B0F900091C4D /* Jit64AsmCommon.cpp */; }; 3E3D74201C82B0F900091C4D /* JitAsmCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D732C1C82B0F900091C4D /* JitAsmCommon.cpp */; }; 3E3D74221C82B0F900091C4D /* JitBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D732F1C82B0F900091C4D /* JitBase.cpp */; }; 3E3D74231C82B0F900091C4D /* JitCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D73311C82B0F900091C4D /* JitCache.cpp */; }; @@ -359,13 +343,13 @@ 3E3D761A1C82B2DE00091C4D /* VideoState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D75E51C82B2DE00091C4D /* VideoState.cpp */; }; 3E3D761B1C82B2DE00091C4D /* XFMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D75E71C82B2DE00091C4D /* XFMemory.cpp */; }; 3E3D761C1C82B2DE00091C4D /* XFStructs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D75E91C82B2DE00091C4D /* XFStructs.cpp */; }; - 3E3D76391C82B30A00091C4D /* BoundingBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D761D1C82B30A00091C4D /* BoundingBox.cpp */; }; - 3E3D763B1C82B30A00091C4D /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D76221C82B30A00091C4D /* main.cpp */; }; - 3E3D763C1C82B30A00091C4D /* NativeVertexFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D76231C82B30A00091C4D /* NativeVertexFormat.cpp */; }; - 3E3D763D1C82B30A00091C4D /* PerfQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D76241C82B30A00091C4D /* PerfQuery.cpp */; }; + 3E3D76391C82B30A00091C4D /* OGLBoundingBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D761D1C82B30A00091C4D /* OGLBoundingBox.cpp */; }; + 3E3D763B1C82B30A00091C4D /* OGLMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D76221C82B30A00091C4D /* OGLMain.cpp */; }; + 3E3D763C1C82B30A00091C4D /* OGLNativeVertexFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D76231C82B30A00091C4D /* OGLNativeVertexFormat.cpp */; }; + 3E3D763D1C82B30A00091C4D /* OGLPerfQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D76241C82B30A00091C4D /* OGLPerfQuery.cpp */; }; 3E3D76421C82B30A00091C4D /* SamplerCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D762E1C82B30A00091C4D /* SamplerCache.cpp */; }; - 3E3D76431C82B30A00091C4D /* StreamBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D76301C82B30A00091C4D /* StreamBuffer.cpp */; }; - 3E3D76461C82B30A00091C4D /* VertexManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D76361C82B30A00091C4D /* VertexManager.cpp */; }; + 3E3D76431C82B30A00091C4D /* OGLStreamBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D76301C82B30A00091C4D /* OGLStreamBuffer.cpp */; }; + 3E3D76461C82B30A00091C4D /* OGLVertexManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D76361C82B30A00091C4D /* OGLVertexManager.cpp */; }; 3E3D76661C82B33700091C4D /* Clipper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D76471C82B33700091C4D /* Clipper.cpp */; }; 3E3D76671C82B33700091C4D /* DebugUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D764A1C82B33700091C4D /* DebugUtil.cpp */; }; 3E3D76681C82B33700091C4D /* EfbCopy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D764C1C82B33700091C4D /* EfbCopy.cpp */; }; @@ -469,7 +453,6 @@ 3E7AE8EB1FB4E9FC0017E3D1 /* Wii.oesystemplugin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 3E2217971D74AB3300C55942 /* Wii.oesystemplugin */; }; 3E89F47D1CCAB4FC00EAE7AC /* State.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D73521C82B0F900091C4D /* State.cpp */; }; 3E8D25F71D21D8C80086BA59 /* Analytics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8D25F61D21D8C80086BA59 /* Analytics.cpp */; }; - 3E8D25FA1D21D8F70086BA59 /* Analytics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8D25F91D21D8F70086BA59 /* Analytics.cpp */; }; 3E8D2A421D21E54B0086BA59 /* asyn-ares.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E8D29C61D21E54B0086BA59 /* asyn-ares.c */; }; 3E8D2A431D21E54B0086BA59 /* asyn-thread.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E8D29C71D21E54B0086BA59 /* asyn-thread.c */; }; 3E8D2A451D21E54B0086BA59 /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E8D29C91D21E54B0086BA59 /* base64.c */; }; @@ -644,11 +627,6 @@ 3E8EC6BB1F8436F100D79F27 /* DSPIntLoadStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8EC6B01F8436F100D79F27 /* DSPIntLoadStore.cpp */; }; 3E8EC6BC1F8436F100D79F27 /* DSPIntMisc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8EC6B21F8436F100D79F27 /* DSPIntMisc.cpp */; }; 3E8EC6BD1F8436F100D79F27 /* DSPIntBranch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8EC6B31F8436F100D79F27 /* DSPIntBranch.cpp */; }; - 3E8EC6D01F84376E00D79F27 /* TrampolineCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8EC6C41F84376900D79F27 /* TrampolineCache.cpp */; }; - 3E8EC6D11F84376E00D79F27 /* FarCodeCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8EC6C61F84376900D79F27 /* FarCodeCache.cpp */; }; - 3E8EC6D21F84376E00D79F27 /* ConstantPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8EC6C81F84376900D79F27 /* ConstantPool.cpp */; }; - 3E8EC6D31F84376E00D79F27 /* EmuCodeBlock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8EC6CA1F84376A00D79F27 /* EmuCodeBlock.cpp */; }; - 3E8EC6D51F84376E00D79F27 /* BlockCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8EC6CE1F84376B00D79F27 /* BlockCache.cpp */; }; 3E8EC6E01F84378E00D79F27 /* BreakPoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8EC6DD1F84378D00D79F27 /* BreakPoints.cpp */; }; 3E8EC6E41F8437BC00D79F27 /* DolReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8EC6E31F8437BB00D79F27 /* DolReader.cpp */; }; 3E8EC6E71F8437D000D79F27 /* RSO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8EC6E51F8437D000D79F27 /* RSO.cpp */; }; @@ -657,15 +635,12 @@ 3E98CDFB1FD70845009A9DEA /* TextureConverterShaderGen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E98CDF91FD70845009A9DEA /* TextureConverterShaderGen.cpp */; }; 3EC6F7691CDBBCE30044AC7E /* Sys in Resources */ = {isa = PBXBuildFile; fileRef = 3EC6F7681CDBBCE30044AC7E /* Sys */; }; 3EF229371CBEC21F00F66A93 /* OpenEmuBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E3D774A1C83DC9000091C4D /* OpenEmuBase.framework */; }; - 3EFF25221F84432A00B4FD11 /* IOdarwin.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E8EC6781F8434C600D79F27 /* IOdarwin.mm */; }; 3EFF25231F84432A00B4FD11 /* WiimoteReal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8EC6791F8434C600D79F27 /* WiimoteReal.cpp */; }; 3EFF25241F84432A00B4FD11 /* IOhidapi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8EC67D1F8434C600D79F27 /* IOhidapi.cpp */; }; 3EFF25921F8443D200B4FD11 /* hid.c in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF25801F8443D200B4FD11 /* hid.c */; }; 3EFF25CC1F8444D200B4FD11 /* GCAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D74A91C82B14B00091C4D /* GCAdapter.cpp */; }; 3EFF260A1F84560100B4FD11 /* CommonFuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF25F61F8455D300B4FD11 /* CommonFuncs.cpp */; }; - 3EFF260C1F84560100B4FD11 /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF25F91F8455D500B4FD11 /* File.cpp */; }; 3EFF260D1F84560100B4FD11 /* HttpRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF25F21F8455D000B4FD11 /* HttpRequest.cpp */; }; - 3EFF260F1F84560100B4FD11 /* MD5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF26011F8455D800B4FD11 /* MD5.cpp */; }; 3EFF26101F84560100B4FD11 /* UPnP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF25F51F8455D200B4FD11 /* UPnP.cpp */; }; 3EFF26231F8458E600B4FD11 /* RenderState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF26111F8458DE00B4FD11 /* RenderState.cpp */; }; 3EFF26241F8458E600B4FD11 /* LightingShaderGen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF26151F8458E000B4FD11 /* LightingShaderGen.cpp */; }; @@ -734,7 +709,7 @@ 3EFF28D41F855F2F00B4FD11 /* Config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF28D11F855F2E00B4FD11 /* Config.cpp */; }; 3EFF291B1F8560BA00B4FD11 /* NullBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF28DF1F85605000B4FD11 /* NullBackend.cpp */; }; 3EFF291C1F8560BA00B4FD11 /* NullTexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF28DE1F85605000B4FD11 /* NullTexture.cpp */; }; - 3EFF291F1F8560BA00B4FD11 /* VertexManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF28E41F85605100B4FD11 /* VertexManager.cpp */; }; + 3EFF291F1F8560BA00B4FD11 /* NullVertexManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF28E41F85605100B4FD11 /* NullVertexManager.cpp */; }; 3EFF29221F8560E000B4FD11 /* libvideonull-dol.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EFF291A1F85606C00B4FD11 /* libvideonull-dol.a */; }; 3EFF29251F85611300B4FD11 /* SWTexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF29231F85611200B4FD11 /* SWTexture.cpp */; }; 3EFF29361F85627000B4FD11 /* cmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF29311F85626700B4FD11 /* cmac.c */; }; @@ -743,8 +718,8 @@ 3EFF293B1F8562D000B4FD11 /* libbdisasm-dol.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F65EF8E25FB448D2BA4D3070 /* libbdisasm-dol.a */; }; 3EFF293E1F85631300B4FD11 /* libdiscio-dol.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 86E3BFC78D1E4A22863D3447 /* libdiscio-dol.a */; }; 3EFF294D1F8581B000B4FD11 /* AGL.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D70261C82AF2A00091C4D /* AGL.mm */; }; - 3EFF294F1F85830500B4FD11 /* Render.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF28DD1F85604F00B4FD11 /* Render.cpp */; }; - 3EFF29571F85A24400B4FD11 /* Render.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E89F4831CCE8AC600EAE7AC /* Render.cpp */; }; + 3EFF294F1F85830500B4FD11 /* NullRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF28DD1F85604F00B4FD11 /* NullRender.cpp */; }; + 3EFF29571F85A24400B4FD11 /* OGLRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E89F4831CCE8AC600EAE7AC /* OGLRender.cpp */; }; 3EFF295F1F85D08700B4FD11 /* libpugixml-dol.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EFF277D1F8461BC00B4FD11 /* libpugixml-dol.a */; }; 55508FC427FA45D400CA618C /* VertexLoaderARCH.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55508FC327FA45D400CA618C /* VertexLoaderARCH.cpp */; }; 55508FC627FA466100CA618C /* TextureDecoderARCH.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55508FC527FA466100CA618C /* TextureDecoderARCH.cpp */; }; @@ -752,6 +727,37 @@ 55508FCC27FA4A3E00CA618C /* FPURoundMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55508FCB27FA4A3E00CA618C /* FPURoundMode.cpp */; }; 55508FD727FA65DD00CA618C /* mbedtls.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E8D2AEC1D21E66F0086BA59 /* mbedtls.c */; }; 55508FD827FA66D200CA618C /* digest.c in Sources */ = {isa = PBXBuildFile; fileRef = 3E8D2AC61D21E6360086BA59 /* digest.c */; }; + 55508FDB27FA749D00CA618C /* IOFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55508FD927FA749D00CA618C /* IOFile.cpp */; }; + 55508FF527FA818E00CA618C /* JitARCH.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55508FF427FA818E00CA618C /* JitARCH.cpp */; }; + 55508FF827FA888B00CA618C /* WiimoteSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55508FF727FA888B00CA618C /* WiimoteSettings.cpp */; }; + 55508FFD27FA8AAC00CA618C /* DefaultLocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55508FFA27FA8AAB00CA618C /* DefaultLocale.cpp */; }; + 55508FFE27FA8AAC00CA618C /* SessionSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55508FFC27FA8AAC00CA618C /* SessionSettings.cpp */; }; + 5550900127FA8AF400CA618C /* DolphinAnalytics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55508FFF27FA8AF400CA618C /* DolphinAnalytics.cpp */; }; + 5550900427FA8B4800CA618C /* NetworkCaptureLogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550900327FA8B4700CA618C /* NetworkCaptureLogger.cpp */; }; + 5550900527FA8B8500CA618C /* Arm64Emitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55508FCD27FA4AA900CA618C /* Arm64Emitter.cpp */; }; + 5550900C27FA8C6600CA618C /* filter_neon_intrinsics.c in Sources */ = {isa = PBXBuildFile; fileRef = 5550900827FA8C6600CA618C /* filter_neon_intrinsics.c */; }; + 5550900D27FA8C6600CA618C /* arm_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 5550900927FA8C6600CA618C /* arm_init.c */; }; + 5550900E27FA8C6600CA618C /* palette_neon_intrinsics.c in Sources */ = {isa = PBXBuildFile; fileRef = 5550900A27FA8C6600CA618C /* palette_neon_intrinsics.c */; }; + 5550901127FA8CD800CA618C /* TMEM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550900F27FA8CD800CA618C /* TMEM.cpp */; }; + 5550901627FA8D9400CA618C /* RiivolutionPatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550901227FA8D9300CA618C /* RiivolutionPatcher.cpp */; }; + 5550901727FA8D9400CA618C /* RiivolutionParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550901527FA8D9400CA618C /* RiivolutionParser.cpp */; }; + 5550901A27FA8F5D00CA618C /* ImageC.c in Sources */ = {isa = PBXBuildFile; fileRef = 5550901827FA8F5D00CA618C /* ImageC.c */; }; + 5550901D27FA8FBA00CA618C /* SWBoundingBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550901B27FA8FBA00CA618C /* SWBoundingBox.cpp */; }; + 5550902027FA903800CA618C /* DiscUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550901E27FA903800CA618C /* DiscUtils.cpp */; }; + 5550902327FA905400CA618C /* GameModDescriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550902127FA905400CA618C /* GameModDescriptor.cpp */; }; + 5550902527FA914000CA618C /* FileSystemCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550902427FA914000CA618C /* FileSystemCommon.cpp */; }; + 5550902727FA989A00CA618C /* imgui_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550902627FA989A00CA618C /* imgui_tables.cpp */; }; + 5550902A27FA98F700CA618C /* TextureInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550902827FA98F700CA618C /* TextureInfo.cpp */; }; + 5550907527FA9F8500CA618C /* DITConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550907127FA9F8500CA618C /* DITConfiguration.cpp */; }; + 5550907627FA9F8500CA618C /* DITSpecification.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550907227FA9F8500CA618C /* DITSpecification.cpp */; }; + 5550907D27FA9FED00CA618C /* GBAPad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550907727FA9FEC00CA618C /* GBAPad.cpp */; }; + 5550907F27FA9FED00CA618C /* GBAPadEmu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550907B27FA9FEC00CA618C /* GBAPadEmu.cpp */; }; + 5550908027FAA05900CA618C /* GraphicsSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3EFF26331F845CA400B4FD11 /* GraphicsSettings.cpp */; }; + 5550908327FAA0D100CA618C /* DivUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550908227FAA0D100CA618C /* DivUtils.cpp */; }; + 5550908627FAA30100CA618C /* SocketContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550908427FAA30100CA618C /* SocketContext.cpp */; }; + 5550908927FAA35E00CA618C /* NetPlayCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550908827FAA35E00CA618C /* NetPlayCommon.cpp */; }; + 5550908A27FAA49A00CA618C /* GDBStub.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E8EC6DE1F84378D00D79F27 /* GDBStub.cpp */; }; + 5550908C27FAA66900CA618C /* WiimoteController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5550908B27FAA66900CA618C /* WiimoteController.cpp */; }; 8355D4C71A65393600E73302 /* libcore-dol.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C0C8A955FC946C29B9EDABF /* libcore-dol.a */; }; 8355D4E41A653B6600E73302 /* DolphinGameCore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8355D4E31A653B6600E73302 /* DolphinGameCore.mm */; }; 8355D4EC1A653E6500E73302 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8349743C1A643F7200E0B28E /* OpenAL.framework */; }; @@ -807,23 +813,23 @@ EE3EC3F3224A82BD00BA7436 /* GCPad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E3D72611C82B0F900091C4D /* GCPad.cpp */; }; EE3EC42F224AA01500BA7436 /* OpenEmuBase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E3D774A1C83DC9000091C4D /* OpenEmuBase.framework */; }; EE45F40F22B4389200C5D0C0 /* CommandBufferManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC41C224A9F5B00BA7436 /* CommandBufferManager.cpp */; }; - EE45F41022B4389200C5D0C0 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC412224A9F5900BA7436 /* main.cpp */; }; + EE45F41022B4389200C5D0C0 /* VKMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC412224A9F5900BA7436 /* VKMain.cpp */; }; EE45F41122B4389200C5D0C0 /* ObjectCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC40D224A9F5800BA7436 /* ObjectCache.cpp */; }; - EE45F41222B4389200C5D0C0 /* PerfQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC41A224A9F5A00BA7436 /* PerfQuery.cpp */; }; - EE45F41322B4389200C5D0C0 /* Renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC3FF224A9F5600BA7436 /* Renderer.cpp */; }; + EE45F41222B4389200C5D0C0 /* VKPerfQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC41A224A9F5A00BA7436 /* VKPerfQuery.cpp */; }; + EE45F41322B4389200C5D0C0 /* VKRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC3FF224A9F5600BA7436 /* VKRenderer.cpp */; }; EE45F41422B4389200C5D0C0 /* ShaderCompiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC40C224A9F5800BA7436 /* ShaderCompiler.cpp */; }; EE45F41522B4389200C5D0C0 /* StagingBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC3F8224A9F5500BA7436 /* StagingBuffer.cpp */; }; EE45F41622B4389200C5D0C0 /* StateTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC413224A9F5900BA7436 /* StateTracker.cpp */; }; - EE45F41722B4389200C5D0C0 /* StreamBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC418224A9F5A00BA7436 /* StreamBuffer.cpp */; }; - EE45F41822B4389200C5D0C0 /* SwapChain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC419224A9F5A00BA7436 /* SwapChain.cpp */; }; - EE45F41922B4389200C5D0C0 /* VertexFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC404224A9F5700BA7436 /* VertexFormat.cpp */; }; - EE45F41A22B4389200C5D0C0 /* VertexManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC3FC224A9F5600BA7436 /* VertexManager.cpp */; }; + EE45F41722B4389200C5D0C0 /* VKStreamBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC418224A9F5A00BA7436 /* VKStreamBuffer.cpp */; }; + EE45F41822B4389200C5D0C0 /* VKSwapChain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC419224A9F5A00BA7436 /* VKSwapChain.cpp */; }; + EE45F41922B4389200C5D0C0 /* VKVertexFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC404224A9F5700BA7436 /* VKVertexFormat.cpp */; }; + EE45F41A22B4389200C5D0C0 /* VKVertexManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC3FC224A9F5600BA7436 /* VKVertexManager.cpp */; }; EE45F41B22B4389200C5D0C0 /* VKPipeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC400224A9F5600BA7436 /* VKPipeline.cpp */; }; EE45F41C22B4389200C5D0C0 /* VKShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC403224A9F5700BA7436 /* VKShader.cpp */; }; EE45F41D22B4389200C5D0C0 /* VKTexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC406224A9F5700BA7436 /* VKTexture.cpp */; }; EE45F41E22B4389200C5D0C0 /* VulkanContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC411224A9F5900BA7436 /* VulkanContext.cpp */; }; EE45F41F22B4389200C5D0C0 /* VulkanLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC40F224A9F5900BA7436 /* VulkanLoader.cpp */; }; - EE45F43222B43AC100C5D0C0 /* BoundingBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC417224A9F5A00BA7436 /* BoundingBox.cpp */; }; + EE45F43222B43AC100C5D0C0 /* VKBoundingBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE3EC417224A9F5A00BA7436 /* VKBoundingBox.cpp */; }; EE45F43722B552A900C5D0C0 /* VolumeVerifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE45F43522B552A900C5D0C0 /* VolumeVerifier.cpp */; }; EE45F43A22B552C500C5D0C0 /* LibusbUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE45F43822B552C500C5D0C0 /* LibusbUtils.cpp */; }; EE45F43D22B5532100C5D0C0 /* AddressSpace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE45F43C22B5532100C5D0C0 /* AddressSpace.cpp */; }; @@ -873,7 +879,7 @@ EE6ABE57239C36D7005E5F7D /* ControlReference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE6ABE52239C36D7005E5F7D /* ControlReference.cpp */; }; EE6ABE58239C36D7005E5F7D /* ExpressionParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE6ABE54239C36D7005E5F7D /* ExpressionParser.cpp */; }; EE6ABE59239C36D7005E5F7D /* FunctionExpression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE6ABE55239C36D7005E5F7D /* FunctionExpression.cpp */; }; - EE6ABE5F239C3724005E5F7D /* Device.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE6ABE5B239C3723005E5F7D /* Device.cpp */; }; + EE6ABE5F239C3724005E5F7D /* CoreDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE6ABE5B239C3723005E5F7D /* CoreDevice.cpp */; }; EE6ABE62239C3738005E5F7D /* ForceFeedbackDevice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE6ABE60239C3738005E5F7D /* ForceFeedbackDevice.cpp */; }; EE6ABE67239C3756005E5F7D /* Pipes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE6ABE65239C3756005E5F7D /* Pipes.cpp */; }; EE6ABE6D239C3766005E5F7D /* OSX.mm in Sources */ = {isa = PBXBuildFile; fileRef = EE6ABE68239C3765005E5F7D /* OSX.mm */; }; @@ -895,7 +901,6 @@ EE6ABEA0239C7858005E5F7D /* ICMPLin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE6ABE9B239C7858005E5F7D /* ICMPLin.cpp */; }; EE6ABEA4239C7874005E5F7D /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE6ABEA1239C7873005E5F7D /* File.cpp */; }; EE6ABEA5239C7874005E5F7D /* FS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE6ABEA2239C7873005E5F7D /* FS.cpp */; }; - EE6ABEAA239C787E005E5F7D /* FileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE6ABEA6239C787D005E5F7D /* FileSystem.cpp */; }; EE6ABEAB239C787E005E5F7D /* FileSystemProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE6ABEA8239C787E005E5F7D /* FileSystemProxy.cpp */; }; EE6ABEB0239C7890005E5F7D /* WFSSRV.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE6ABEAC239C788F005E5F7D /* WFSSRV.cpp */; }; EE6ABEB1239C7890005E5F7D /* WFSI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE6ABEAE239C7890005E5F7D /* WFSI.cpp */; }; @@ -940,7 +945,6 @@ EE79F8A725A7686000EE9AAC /* FreeLookSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE79F8A625A7685F00EE9AAC /* FreeLookSettings.cpp */; }; EE79F8DC25A768BE00EE9AAC /* DynamicInputTextureManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE79F8D525A768BD00EE9AAC /* DynamicInputTextureManager.cpp */; }; EE79F8DD25A768BE00EE9AAC /* ImageOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE79F8D725A768BD00EE9AAC /* ImageOperations.cpp */; }; - EE79F8DE25A768BE00EE9AAC /* DynamicInputTextureConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE79F8D825A768BE00EE9AAC /* DynamicInputTextureConfiguration.cpp */; }; EE89731420B60C3F00F073C1 /* MemoryPatches.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE89731220B60C3E00F073C1 /* MemoryPatches.cpp */; }; EE8DD25C2249286B005E1AF5 /* GLContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE8DD25B2249286B005E1AF5 /* GLContext.cpp */; }; EE8DD27322492AD8005E1AF5 /* imgui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE8DD26422492A9F005E1AF5 /* imgui.cpp */; }; @@ -1050,7 +1054,6 @@ EE98C04224B924EE00FFFDD7 /* SpvTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE98C03F24B924ED00FFFDD7 /* SpvTools.cpp */; }; EE98C04324B924EE00FFFDD7 /* SpvPostProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE98C04124B924EE00FFFDD7 /* SpvPostProcess.cpp */; }; EE98C04A24B926B600FFFDD7 /* TAP_Apple.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE98C04724B9268400FFFDD7 /* TAP_Apple.cpp */; }; - EE98C04E24B92ADA00FFFDD7 /* Wiimote.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE98C04D24B92AD900FFFDD7 /* Wiimote.cpp */; }; EE98C05324B92D0200FFFDD7 /* XLINK_KAI_BBA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE98C04924B9268400FFFDD7 /* XLINK_KAI_BBA.cpp */; }; EE9C006C20A4F94000312609 /* Watches.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE9C006920A4F93F00312609 /* Watches.cpp */; }; EE9C007020A4FA8C00312609 /* SysConf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE9C006E20A4FA8B00312609 /* SysConf.cpp */; }; @@ -1153,13 +1156,6 @@ remoteGlobalIDString = 75A40CDC6A8F4D759F46EA48; remoteInfo = inputcommon; }; - 1F3712C0751541BD9CBB8D1A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = F4243CD8A395409DB8AF7197; - remoteInfo = png; - }; 21167F4966EE4F11932AA12E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; @@ -1174,13 +1170,6 @@ remoteGlobalIDString = F4243CD8A395409DB8AF7197; remoteInfo = png; }; - 254D0F01EF154DD7AD279062 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = C8D71164030546149D73799E; - remoteInfo = SoundTouch; - }; 26E0C22CEF7645D3BE41B352 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; @@ -1195,244 +1184,6 @@ remoteGlobalIDString = AECE51C4C7E0411EA86B7548; remoteInfo = pch; }; - 3E8D27CE1D21DA830086BA59 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3E8D26021D21D9A70086BA59; - remoteInfo = curl; - }; - 3EFF25961F84441100B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3EFF25251F84437500B4FD11; - remoteInfo = hidapi; - }; - 3EFF27931F84622700B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3EFF277E1F8461CA00B4FD11; - remoteInfo = cubeb; - }; - 3EFF287F1F85528100B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3EFF28651F85514300B4FD11; - remoteInfo = libusb; - }; - 3EFF28871F85580B00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = B0D48831F54442B2AEF377D1; - remoteInfo = miniupnpc; - }; - 3EFF288E1F8559A100B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 93DC42BE7F7E4655BA37E803; - remoteInfo = "sfml-network"; - }; - 3EFF28901F8559A100B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = B7D6D77CD9AE47AE971CBE25; - remoteInfo = "sfml-system"; - }; - 3EFF28941F8559F300B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3E3D76A31C839C5400091C4D; - remoteInfo = mbedtls; - }; - 3EFF28971F855A1D00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = F4243CD8A395409DB8AF7197; - remoteInfo = png; - }; - 3EFF289A1F855B7700B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3E3D76801C839B2E00091C4D; - remoteInfo = enet; - }; - 3EFF28A31F855BD100B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = B25C5C437ED44D7A82B1AAEE; - remoteInfo = lzo2; - }; - 3EFF28AF1F855CE900B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = FFA5E2D5A7C543E9AEF69BE8; - remoteInfo = audiocommon; - }; - 3EFF28B11F855CE900B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 75A40CDC6A8F4D759F46EA48; - remoteInfo = inputcommon; - }; - 3EFF28B51F855CE900B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = F603B7AA040D462DA9BCE40B; - remoteInfo = videocommon; - }; - 3EFF28BB1F855D2600B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 43265322269841A88B884F87; - remoteInfo = common; - }; - 3EFF28C31F855DF200B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = B6E9C99F5466426CB1BE4600; - remoteInfo = videoogl; - }; - 3EFF28C51F855DF200B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = D825688E394642D19FD24A29; - remoteInfo = videosoftware; - }; - 3EFF28ED1F85606C00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = B0D48831F54442B2AEF377D1; - remoteInfo = miniupnpc; - }; - 3EFF28EF1F85606C00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 93DC42BE7F7E4655BA37E803; - remoteInfo = "sfml-network"; - }; - 3EFF28F11F85606C00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = B7D6D77CD9AE47AE971CBE25; - remoteInfo = "sfml-system"; - }; - 3EFF28F51F85606C00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = AECE51C4C7E0411EA86B7548; - remoteInfo = pch; - }; - 3EFF28F71F85606C00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = FFA5E2D5A7C543E9AEF69BE8; - remoteInfo = audiocommon; - }; - 3EFF28F91F85606C00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = CA310A90E1D643F2BE825C01; - remoteInfo = discio; - }; - 3EFF28FB1F85606C00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 75A40CDC6A8F4D759F46EA48; - remoteInfo = inputcommon; - }; - 3EFF28FD1F85606C00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = B25C5C437ED44D7A82B1AAEE; - remoteInfo = lzo2; - }; - 3EFF28FF1F85606C00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 79836D15F4E048CFBA06C188; - remoteInfo = bdisasm; - }; - 3EFF29011F85606C00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = F4243CD8A395409DB8AF7197; - remoteInfo = png; - }; - 3EFF29031F85606C00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = C8D71164030546149D73799E; - remoteInfo = SoundTouch; - }; - 3EFF29051F85606C00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 43265322269841A88B884F87; - remoteInfo = common; - }; - 3EFF29201F8560DC00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3EFF28EB1F85606C00B4FD11; - remoteInfo = videonull; - }; - 3EFF29391F8562C700B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 79836D15F4E048CFBA06C188; - remoteInfo = bdisasm; - }; - 3EFF293C1F85630E00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = CA310A90E1D643F2BE825C01; - remoteInfo = discio; - }; - 3EFF29461F8567DA00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A33327301E8D455CABCEF3CE; - remoteInfo = uicommon; - }; - 3EFF295D1F85D07E00B4FD11 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3EFF27751F8461BC00B4FD11; - remoteInfo = pugixml; - }; 466AAC66DCE0412DB5ABDFF9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; @@ -1440,26 +1191,250 @@ remoteGlobalIDString = 42A1E11FFDFD470D8368323A; remoteInfo = core; }; - 5923D65A8F9B41DDAC58349A /* PBXContainerItemProxy */ = { + 5550902B27FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = EE8DD2D7224A7F04005E1AF5; + remoteInfo = FreeSurround; + }; + 5550902D27FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = EEC94A52224ABFDC00F85ABA; + remoteInfo = OGLCompilersDLL; + }; + 5550902F27FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = EE475745224AB2F30027BA05; + remoteInfo = SPIRV; + }; + 5550903127FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = C8D71164030546149D73799E; + remoteInfo = SoundTouch; + }; + 5550903327FA9E6A00CA618C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; proxyType = 1; remoteGlobalIDString = FFA5E2D5A7C543E9AEF69BE8; remoteInfo = audiocommon; }; - 59D36B0EEF3C451FAD897DE8 /* PBXContainerItemProxy */ = { + 5550903527FA9E6A00CA618C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; proxyType = 1; - remoteGlobalIDString = AECE51C4C7E0411EA86B7548; - remoteInfo = pch; + remoteGlobalIDString = 79836D15F4E048CFBA06C188; + remoteInfo = bdisasm; }; - 64A64D118E9A420FA0458C02 /* PBXContainerItemProxy */ = { + 5550903727FA9E6A00CA618C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; proxyType = 1; - remoteGlobalIDString = AECE51C4C7E0411EA86B7548; - remoteInfo = pch; + remoteGlobalIDString = EE98C00E24B91E1700FFFDD7; + remoteInfo = bzip2; + }; + 5550903927FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 43265322269841A88B884F87; + remoteInfo = common; + }; + 5550903B27FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3EFF277E1F8461CA00B4FD11; + remoteInfo = cubeb; + }; + 5550903D27FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3E8D26021D21D9A70086BA59; + remoteInfo = curl; + }; + 5550903F27FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = CA310A90E1D643F2BE825C01; + remoteInfo = discio; + }; + 5550904127FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3E3D76801C839B2E00091C4D; + remoteInfo = enet; + }; + 5550904327FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = EE3A464922B6874500031B56; + remoteInfo = fmt; + }; + 5550904527FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = EEF4EECC224AAF5D0077748D; + remoteInfo = glslang; + }; + 5550904727FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3EFF25251F84437500B4FD11; + remoteInfo = hidapi; + }; + 5550904927FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = EE8DD26A22492AAB005E1AF5; + remoteInfo = imgui; + }; + 5550904B27FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 75A40CDC6A8F4D759F46EA48; + remoteInfo = inputcommon; + }; + 5550904D27FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3EFF28651F85514300B4FD11; + remoteInfo = libusb; + }; + 5550904F27FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = EE98BE9A24B8FC5600FFFDD7; + remoteInfo = lzma; + }; + 5550905127FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = B25C5C437ED44D7A82B1AAEE; + remoteInfo = lzo2; + }; + 5550905327FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3E3D76A31C839C5400091C4D; + remoteInfo = mbedtls; + }; + 5550905527FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = B0D48831F54442B2AEF377D1; + remoteInfo = miniupnpc; + }; + 5550905727FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = F4243CD8A395409DB8AF7197; + remoteInfo = png; + }; + 5550905927FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3EFF27751F8461BC00B4FD11; + remoteInfo = pugixml; + }; + 5550905B27FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 93DC42BE7F7E4655BA37E803; + remoteInfo = "sfml-network"; + }; + 5550905D27FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = B7D6D77CD9AE47AE971CBE25; + remoteInfo = "sfml-system"; + }; + 5550905F27FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A33327301E8D455CABCEF3CE; + remoteInfo = uicommon; + }; + 5550906127FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = F603B7AA040D462DA9BCE40B; + remoteInfo = videocommon; + }; + 5550906327FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3EFF28EB1F85606C00B4FD11; + remoteInfo = videonull; + }; + 5550906527FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = B6E9C99F5466426CB1BE4600; + remoteInfo = videoogl; + }; + 5550906727FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D825688E394642D19FD24A29; + remoteInfo = videosoftware; + }; + 5550906927FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = EE3EC41D224AA01500BA7436; + remoteInfo = videovulkan; + }; + 5550906B27FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 8378DE981A7862DA003DA046; + remoteInfo = xxhash; + }; + 5550906D27FA9E6A00CA618C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = EE98BE1F24B8F60B00FFFDD7; + remoteInfo = zstd; + }; + 5923D65A8F9B41DDAC58349A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; + proxyType = 1; + remoteGlobalIDString = FFA5E2D5A7C543E9AEF69BE8; + remoteInfo = audiocommon; }; 700827076A3F4B62999D8595 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -1482,13 +1457,6 @@ remoteGlobalIDString = 8355D4921A6538FD00E73302; remoteInfo = "Dolphin-Core"; }; - 8378DECF1A786335003DA046 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8378DE981A7862DA003DA046; - remoteInfo = xxhash; - }; 86BBED09E7BB446D9F10EE75 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; @@ -1538,62 +1506,6 @@ remoteGlobalIDString = 3E2217961D74AB3300C55942; remoteInfo = Wii; }; - EE3A465D22B687FA00031B56 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = EE3A464922B6874500031B56; - remoteInfo = fmt; - }; - EE3EC41F224AA01500BA7436 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = D825688E394642D19FD24A29; - remoteInfo = videosoftware; - }; - EE3EC448224AA0A800BA7436 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = EE3EC41D224AA01500BA7436; - remoteInfo = videovulkan; - }; - EE475774224AB34C0027BA05 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = EE475745224AB2F30027BA05; - remoteInfo = SPIRV; - }; - EE47577A224AB4D20027BA05 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = EE3EC41D224AA01500BA7436; - remoteInfo = videovulkan; - }; - EE47577C224AB5E60027BA05 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = EE475745224AB2F30027BA05; - remoteInfo = SPIRV; - }; - EE8DD2C2224A7D86005E1AF5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = EE8DD26A22492AAB005E1AF5; - remoteInfo = imgui; - }; - EE8DD2EB224A7F73005E1AF5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = EE8DD2D7224A7F04005E1AF5; - remoteInfo = FreeSurround; - }; EE8DD48809EA4F83B02FD89E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; @@ -1601,13 +1513,6 @@ remoteGlobalIDString = 9C44D53AD3A548718E1CFB61; remoteInfo = ALL_BUILD; }; - EE98BE9624B8F68D00FFFDD7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = EE98BE1F24B8F60B00FFFDD7; - remoteInfo = zstd; - }; EEC94A64224AC08500F85ABA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; @@ -1622,48 +1527,6 @@ remoteGlobalIDString = EEC94A52224ABFDC00F85ABA; remoteInfo = OGLCompilersDLL; }; - EECD371F224AAAD5000AE115 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = A33327301E8D455CABCEF3CE; - remoteInfo = uicommon; - }; - EEE07D3A22C272CE006D46FD /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = FFA5E2D5A7C543E9AEF69BE8; - remoteInfo = audiocommon; - }; - EEF4EF0B224AAFFE0077748D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = EEF4EECC224AAF5D0077748D; - remoteInfo = glslang; - }; - F1A037FE65A947509FF551F8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = AECE51C4C7E0411EA86B7548; - remoteInfo = pch; - }; - F8D769758A4A4B5EB3C5F577 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = D825688E394642D19FD24A29; - remoteInfo = videosoftware; - }; - FE7AE5890A4A495E9268B01E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8AE37EB7920C4C86939DE6E9 /* Project object */; - proxyType = 1; - remoteGlobalIDString = B6E9C99F5466426CB1BE4600; - remoteInfo = videoogl; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -1683,7 +1546,6 @@ 0AB74F25F8044E96B632EF77 /* libvideosoftware-dol.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libvideosoftware-dol.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 125948FD17D5434DA13C8293 /* libuicommon-dol.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libuicommon-dol.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 3DB9EC0F64AC4815A7E27952 /* libvideocommon-dol.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libvideocommon-dol.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 3E1EFC851CB6AEB0001998A2 /* SamplerCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SamplerCommon.h; sourceTree = ""; }; 3E2217891D74A83E00C55942 /* OEWiiSystemController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OEWiiSystemController.h; sourceTree = ""; }; 3E22178A1D74A83E00C55942 /* OEWiiSystemController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OEWiiSystemController.m; sourceTree = ""; }; 3E22178B1D74A83E00C55942 /* OEWiiSystemResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OEWiiSystemResponder.h; sourceTree = ""; }; @@ -1749,9 +1611,6 @@ 3E3D70A61C82B08500091C4D /* stdafx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stdafx.h; sourceTree = ""; }; 3E3D70A71C82B08500091C4D /* syntax.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = syntax.cc; sourceTree = ""; }; 3E3D70AD1C82B0BB00091C4D /* Assert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Assert.h; sourceTree = ""; }; - 3E3D70AE1C82B0BB00091C4D /* Atomic_GCC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Atomic_GCC.h; sourceTree = ""; }; - 3E3D70AF1C82B0BB00091C4D /* Atomic_Win32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Atomic_Win32.h; sourceTree = ""; }; - 3E3D70B01C82B0BB00091C4D /* Atomic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Atomic.h; sourceTree = ""; }; 3E3D70B11C82B0BB00091C4D /* BitField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitField.h; sourceTree = ""; }; 3E3D70B31C82B0BB00091C4D /* BitSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitSet.h; sourceTree = ""; }; 3E3D70B41C82B0BB00091C4D /* BlockingLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlockingLoop.h; sourceTree = ""; }; @@ -1849,7 +1708,7 @@ 3E3D712B1C82B0BB00091C4D /* make_scmrev.h.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = make_scmrev.h.js; sourceTree = ""; }; 3E3D712C1C82B0BB00091C4D /* MathUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathUtil.cpp; sourceTree = ""; }; 3E3D712D1C82B0BB00091C4D /* MathUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathUtil.h; sourceTree = ""; }; - 3E3D712E1C82B0BB00091C4D /* MemArena.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemArena.cpp; sourceTree = ""; }; + 3E3D712E1C82B0BB00091C4D /* MemArenaUnix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemArenaUnix.cpp; sourceTree = ""; }; 3E3D712F1C82B0BB00091C4D /* MemArena.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemArena.h; sourceTree = ""; }; 3E3D71301C82B0BB00091C4D /* MemoryUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryUtil.cpp; sourceTree = ""; }; 3E3D71311C82B0BB00091C4D /* MemoryUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryUtil.h; sourceTree = ""; }; @@ -1942,16 +1801,10 @@ 3E3D71EC1C82B0F800091C4D /* LabelMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelMap.h; sourceTree = ""; }; 3E3D71ED1C82B0F800091C4D /* DSPEmulator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DSPEmulator.cpp; sourceTree = ""; }; 3E3D71EE1C82B0F800091C4D /* DSPEmulator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DSPEmulator.h; sourceTree = ""; }; - 3E3D71F21C82B0F800091C4D /* FifoAnalyzer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FifoAnalyzer.cpp; sourceTree = ""; }; - 3E3D71F31C82B0F800091C4D /* FifoAnalyzer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FifoAnalyzer.h; sourceTree = ""; }; 3E3D71F41C82B0F800091C4D /* FifoDataFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FifoDataFile.cpp; sourceTree = ""; }; 3E3D71F51C82B0F800091C4D /* FifoDataFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FifoDataFile.h; sourceTree = ""; }; - 3E3D71F71C82B0F800091C4D /* FifoPlaybackAnalyzer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FifoPlaybackAnalyzer.cpp; sourceTree = ""; }; - 3E3D71F81C82B0F800091C4D /* FifoPlaybackAnalyzer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FifoPlaybackAnalyzer.h; sourceTree = ""; }; 3E3D71F91C82B0F800091C4D /* FifoPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FifoPlayer.cpp; sourceTree = ""; }; 3E3D71FA1C82B0F800091C4D /* FifoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FifoPlayer.h; sourceTree = ""; }; - 3E3D71FB1C82B0F800091C4D /* FifoRecordAnalyzer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FifoRecordAnalyzer.cpp; sourceTree = ""; }; - 3E3D71FC1C82B0F800091C4D /* FifoRecordAnalyzer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FifoRecordAnalyzer.h; sourceTree = ""; }; 3E3D71FD1C82B0F800091C4D /* FifoRecorder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FifoRecorder.cpp; sourceTree = ""; }; 3E3D71FE1C82B0F800091C4D /* FifoRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FifoRecorder.h; sourceTree = ""; }; 3E3D71FF1C82B0F800091C4D /* GeckoCode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeckoCode.cpp; sourceTree = ""; }; @@ -1998,8 +1851,6 @@ 3E3D72341C82B0F900091C4D /* DSPHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DSPHost.cpp; sourceTree = ""; }; 3E3D72351C82B0F900091C4D /* DSPLLE.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DSPLLE.cpp; sourceTree = ""; }; 3E3D72361C82B0F900091C4D /* DSPLLE.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DSPLLE.h; sourceTree = ""; }; - 3E3D72371C82B0F900091C4D /* DSPLLEGlobals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DSPLLEGlobals.cpp; sourceTree = ""; }; - 3E3D72381C82B0F900091C4D /* DSPLLEGlobals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DSPLLEGlobals.h; sourceTree = ""; }; 3E3D723B1C82B0F900091C4D /* DSPSymbols.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DSPSymbols.cpp; sourceTree = ""; }; 3E3D723C1C82B0F900091C4D /* DSPSymbols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DSPSymbols.h; sourceTree = ""; }; 3E3D72571C82B0F900091C4D /* GCKeyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GCKeyboard.cpp; sourceTree = ""; }; @@ -2297,22 +2148,22 @@ 3E3D75E81C82B2DE00091C4D /* XFMemory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XFMemory.h; sourceTree = ""; }; 3E3D75E91C82B2DE00091C4D /* XFStructs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XFStructs.cpp; sourceTree = ""; }; 3E3D75EA1C82B2DE00091C4D /* XFStructs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XFStructs.h; sourceTree = ""; }; - 3E3D761D1C82B30A00091C4D /* BoundingBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BoundingBox.cpp; sourceTree = ""; }; - 3E3D761E1C82B30A00091C4D /* BoundingBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BoundingBox.h; sourceTree = ""; }; - 3E3D76221C82B30A00091C4D /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; - 3E3D76231C82B30A00091C4D /* NativeVertexFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NativeVertexFormat.cpp; sourceTree = ""; }; - 3E3D76241C82B30A00091C4D /* PerfQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerfQuery.cpp; sourceTree = ""; }; - 3E3D76251C82B30A00091C4D /* PerfQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerfQuery.h; sourceTree = ""; }; + 3E3D761D1C82B30A00091C4D /* OGLBoundingBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OGLBoundingBox.cpp; sourceTree = ""; }; + 3E3D761E1C82B30A00091C4D /* OGLBoundingBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OGLBoundingBox.h; sourceTree = ""; }; + 3E3D76221C82B30A00091C4D /* OGLMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OGLMain.cpp; sourceTree = ""; }; + 3E3D76231C82B30A00091C4D /* OGLNativeVertexFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OGLNativeVertexFormat.cpp; sourceTree = ""; }; + 3E3D76241C82B30A00091C4D /* OGLPerfQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OGLPerfQuery.cpp; sourceTree = ""; }; + 3E3D76251C82B30A00091C4D /* OGLPerfQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OGLPerfQuery.h; sourceTree = ""; }; 3E3D76281C82B30A00091C4D /* ProgramShaderCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProgramShaderCache.cpp; sourceTree = ""; }; 3E3D76291C82B30A00091C4D /* ProgramShaderCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProgramShaderCache.h; sourceTree = ""; }; - 3E3D762C1C82B30A00091C4D /* Render.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Render.cpp; sourceTree = ""; }; - 3E3D762D1C82B30A00091C4D /* Render.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Render.h; sourceTree = ""; }; + 3E3D762C1C82B30A00091C4D /* OGLRender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OGLRender.cpp; sourceTree = ""; }; + 3E3D762D1C82B30A00091C4D /* OGLRender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OGLRender.h; sourceTree = ""; }; 3E3D762E1C82B30A00091C4D /* SamplerCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SamplerCache.cpp; sourceTree = ""; }; 3E3D762F1C82B30A00091C4D /* SamplerCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SamplerCache.h; sourceTree = ""; }; - 3E3D76301C82B30A00091C4D /* StreamBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StreamBuffer.cpp; sourceTree = ""; }; - 3E3D76311C82B30A00091C4D /* StreamBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamBuffer.h; sourceTree = ""; }; - 3E3D76361C82B30A00091C4D /* VertexManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VertexManager.cpp; sourceTree = ""; }; - 3E3D76371C82B30A00091C4D /* VertexManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VertexManager.h; sourceTree = ""; }; + 3E3D76301C82B30A00091C4D /* OGLStreamBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OGLStreamBuffer.cpp; sourceTree = ""; }; + 3E3D76311C82B30A00091C4D /* OGLStreamBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OGLStreamBuffer.h; sourceTree = ""; }; + 3E3D76361C82B30A00091C4D /* OGLVertexManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OGLVertexManager.cpp; sourceTree = ""; }; + 3E3D76371C82B30A00091C4D /* OGLVertexManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OGLVertexManager.h; sourceTree = ""; }; 3E3D76381C82B30A00091C4D /* VideoBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoBackend.h; sourceTree = ""; }; 3E3D76471C82B33700091C4D /* Clipper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Clipper.cpp; sourceTree = ""; }; 3E3D76481C82B33700091C4D /* Clipper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Clipper.h; sourceTree = ""; }; @@ -2436,11 +2287,9 @@ 3E6EF0EE1C98C8C7004C6F58 /* FileUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileUtil.cpp; sourceTree = ""; }; 3E7AE8E61FB4E6750017E3D1 /* WiiSaveBanner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WiiSaveBanner.cpp; sourceTree = ""; }; 3E7AE8E71FB4E6750017E3D1 /* WiiSaveBanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WiiSaveBanner.h; sourceTree = ""; }; - 3E89F4831CCE8AC600EAE7AC /* Render.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Render.cpp; sourceTree = ""; }; + 3E89F4831CCE8AC600EAE7AC /* OGLRender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OGLRender.cpp; sourceTree = ""; }; 3E8D25F61D21D8C80086BA59 /* Analytics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Analytics.cpp; sourceTree = ""; }; 3E8D25F81D21D8DF0086BA59 /* Analytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Analytics.h; sourceTree = ""; }; - 3E8D25F91D21D8F70086BA59 /* Analytics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Analytics.cpp; sourceTree = ""; }; - 3E8D25FB1D21D9040086BA59 /* Analytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Analytics.h; sourceTree = ""; }; 3E8D26031D21D9A70086BA59 /* libcurl-dol.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcurl-dol.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 3E8D29C61D21E54B0086BA59 /* asyn-ares.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "asyn-ares.c"; sourceTree = ""; }; 3E8D29C71D21E54B0086BA59 /* asyn-thread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "asyn-thread.c"; sourceTree = ""; }; @@ -2775,11 +2624,8 @@ 3E8EC6551F8434A900D79F27 /* EXI_DeviceEthernet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EXI_DeviceEthernet.h; sourceTree = ""; }; 3E8EC6561F8434A900D79F27 /* EXI_DeviceAD16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EXI_DeviceAD16.cpp; sourceTree = ""; }; 3E8EC6571F8434A900D79F27 /* EXI_DeviceDummy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EXI_DeviceDummy.cpp; sourceTree = ""; }; - 3E8EC6771F8434C600D79F27 /* IOdarwin_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOdarwin_private.h; sourceTree = ""; }; - 3E8EC6781F8434C600D79F27 /* IOdarwin.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = IOdarwin.mm; sourceTree = ""; }; 3E8EC6791F8434C600D79F27 /* WiimoteReal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WiimoteReal.cpp; sourceTree = ""; }; 3E8EC67A1F8434C600D79F27 /* WiimoteReal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WiimoteReal.h; sourceTree = ""; }; - 3E8EC67C1F8434C600D79F27 /* IOdarwin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOdarwin.h; sourceTree = ""; }; 3E8EC67D1F8434C600D79F27 /* IOhidapi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IOhidapi.cpp; sourceTree = ""; }; 3E8EC6821F8434C600D79F27 /* IOhidapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOhidapi.h; sourceTree = ""; }; 3E8EC6831F8434C600D79F27 /* IODummy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IODummy.h; sourceTree = ""; }; @@ -2822,7 +2668,7 @@ 3E8EC6E81F8437EB00D79F27 /* HLE_VarArgs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HLE_VarArgs.cpp; sourceTree = ""; }; 3E8EC6E91F8437EC00D79F27 /* HLE_VarArgs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HLE_VarArgs.h; sourceTree = ""; }; 3E96B3C81F86A50C007C5799 /* OpenEmuInput.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenEmuInput.h; sourceTree = ""; }; - 3E96B3C91F86A50D007C5799 /* OpenEmuInput.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = OpenEmuInput.cpp; sourceTree = ""; }; + 3E96B3C91F86A50D007C5799 /* OpenEmuInput.cpp */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OpenEmuInput.cpp; sourceTree = ""; }; 3E98CDF61FD70844009A9DEA /* AbstractStagingTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AbstractStagingTexture.h; sourceTree = ""; }; 3E98CDF71FD70844009A9DEA /* AbstractStagingTexture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AbstractStagingTexture.cpp; sourceTree = ""; }; 3E98CDF81FD70845009A9DEA /* TextureConverterShaderGen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureConverterShaderGen.h; sourceTree = ""; }; @@ -2834,20 +2680,16 @@ 3EFF25F11F8455D000B4FD11 /* BitUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BitUtils.h; sourceTree = ""; }; 3EFF25F21F8455D000B4FD11 /* HttpRequest.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = HttpRequest.cpp; sourceTree = ""; }; 3EFF25F31F8455D100B4FD11 /* CompatPatches.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CompatPatches.cpp; sourceTree = ""; }; - 3EFF25F41F8455D100B4FD11 /* MD5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MD5.h; sourceTree = ""; }; 3EFF25F51F8455D200B4FD11 /* UPnP.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UPnP.cpp; sourceTree = ""; }; 3EFF25F61F8455D300B4FD11 /* CommonFuncs.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CommonFuncs.cpp; sourceTree = ""; }; 3EFF25F71F8455D400B4FD11 /* Semaphore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Semaphore.h; sourceTree = ""; }; 3EFF25F81F8455D400B4FD11 /* LdrWatcher.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LdrWatcher.cpp; sourceTree = ""; }; - 3EFF25F91F8455D500B4FD11 /* File.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = File.cpp; sourceTree = ""; }; - 3EFF25FA1F8455D500B4FD11 /* File.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = ""; }; 3EFF25FB1F8455D500B4FD11 /* x64Reg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = x64Reg.h; sourceTree = ""; }; 3EFF25FC1F8455D600B4FD11 /* Swap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Swap.h; sourceTree = ""; }; 3EFF25FD1F8455D600B4FD11 /* LdrWatcher.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LdrWatcher.h; sourceTree = ""; }; 3EFF25FE1F8455D700B4FD11 /* Lazy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Lazy.h; sourceTree = ""; }; 3EFF25FF1F8455D700B4FD11 /* HttpRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HttpRequest.h; sourceTree = ""; }; 3EFF26001F8455D800B4FD11 /* UPnP.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UPnP.h; sourceTree = ""; }; - 3EFF26011F8455D800B4FD11 /* MD5.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MD5.cpp; sourceTree = ""; }; 3EFF26021F8455D800B4FD11 /* WorkQueueThread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WorkQueueThread.h; sourceTree = ""; }; 3EFF26111F8458DE00B4FD11 /* RenderState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderState.cpp; sourceTree = ""; }; 3EFF26121F8458DF00B4FD11 /* UberShaderPixel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UberShaderPixel.h; sourceTree = ""; }; @@ -3001,14 +2843,14 @@ 3EFF28D11F855F2E00B4FD11 /* Config.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config.cpp; sourceTree = ""; }; 3EFF28D91F85604E00B4FD11 /* NullTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NullTexture.h; sourceTree = ""; }; 3EFF28DA1F85604F00B4FD11 /* VideoBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoBackend.h; sourceTree = ""; }; - 3EFF28DC1F85604F00B4FD11 /* Render.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Render.h; sourceTree = ""; }; - 3EFF28DD1F85604F00B4FD11 /* Render.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Render.cpp; sourceTree = ""; }; + 3EFF28DC1F85604F00B4FD11 /* NullRender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NullRender.h; sourceTree = ""; }; + 3EFF28DD1F85604F00B4FD11 /* NullRender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NullRender.cpp; sourceTree = ""; }; 3EFF28DE1F85605000B4FD11 /* NullTexture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NullTexture.cpp; sourceTree = ""; }; 3EFF28DF1F85605000B4FD11 /* NullBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NullBackend.cpp; sourceTree = ""; }; 3EFF28E01F85605000B4FD11 /* PerfQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerfQuery.h; sourceTree = ""; }; - 3EFF28E11F85605000B4FD11 /* VertexManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VertexManager.h; sourceTree = ""; }; + 3EFF28E11F85605000B4FD11 /* NullVertexManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NullVertexManager.h; sourceTree = ""; }; 3EFF28E21F85605100B4FD11 /* TextureCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureCache.h; sourceTree = ""; }; - 3EFF28E41F85605100B4FD11 /* VertexManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VertexManager.cpp; sourceTree = ""; }; + 3EFF28E41F85605100B4FD11 /* NullVertexManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NullVertexManager.cpp; sourceTree = ""; }; 3EFF291A1F85606C00B4FD11 /* libvideonull-dol.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libvideonull-dol.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 3EFF29231F85611200B4FD11 /* SWTexture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SWTexture.cpp; sourceTree = ""; }; 3EFF29241F85611200B4FD11 /* SWTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWTexture.h; sourceTree = ""; }; @@ -3025,6 +2867,78 @@ 55508FCB27FA4A3E00CA618C /* FPURoundMode.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FPURoundMode.cpp; sourceTree = ""; }; 55508FCD27FA4AA900CA618C /* Arm64Emitter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Arm64Emitter.cpp; sourceTree = ""; }; 55508FCE27FA4AA900CA618C /* Arm64Emitter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Arm64Emitter.h; sourceTree = ""; }; + 55508FD927FA749D00CA618C /* IOFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IOFile.cpp; sourceTree = ""; }; + 55508FDA27FA749D00CA618C /* IOFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOFile.h; sourceTree = ""; }; + 55508FDF27FA815E00CA618C /* JitArm64_BackPatch.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JitArm64_BackPatch.cpp; sourceTree = ""; }; + 55508FE027FA815E00CA618C /* JitArm64Cache.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JitArm64Cache.cpp; sourceTree = ""; }; + 55508FE127FA815E00CA618C /* JitArm64_Integer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JitArm64_Integer.cpp; sourceTree = ""; }; + 55508FE227FA815E00CA618C /* JitArm64_FloatingPoint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JitArm64_FloatingPoint.cpp; sourceTree = ""; }; + 55508FE327FA815E00CA618C /* Jit.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Jit.cpp; sourceTree = ""; }; + 55508FE427FA815E00CA618C /* JitArm64_SystemRegisters.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JitArm64_SystemRegisters.cpp; sourceTree = ""; }; + 55508FE527FA815E00CA618C /* Jit_Util.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Jit_Util.cpp; sourceTree = ""; }; + 55508FE627FA815E00CA618C /* Jit_Util.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Jit_Util.h; sourceTree = ""; }; + 55508FE727FA815E00CA618C /* JitArm64_RegCache.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JitArm64_RegCache.cpp; sourceTree = ""; }; + 55508FE827FA815E00CA618C /* JitArm64_LoadStorePaired.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JitArm64_LoadStorePaired.cpp; sourceTree = ""; }; + 55508FE927FA815E00CA618C /* JitArm64_LoadStoreFloating.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JitArm64_LoadStoreFloating.cpp; sourceTree = ""; }; + 55508FEA27FA815E00CA618C /* Jit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Jit.h; sourceTree = ""; }; + 55508FEB27FA815E00CA618C /* JitArm64_Tables.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JitArm64_Tables.cpp; sourceTree = ""; }; + 55508FEC27FA815E00CA618C /* JitArm64_Branch.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JitArm64_Branch.cpp; sourceTree = ""; }; + 55508FED27FA815E00CA618C /* JitArm64Cache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitArm64Cache.h; sourceTree = ""; }; + 55508FEE27FA815E00CA618C /* JitArm64_RegCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitArm64_RegCache.h; sourceTree = ""; }; + 55508FEF27FA815E00CA618C /* JitAsm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JitAsm.cpp; sourceTree = ""; }; + 55508FF027FA815E00CA618C /* JitArm64_Paired.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JitArm64_Paired.cpp; sourceTree = ""; }; + 55508FF127FA815E00CA618C /* JitArm64_LoadStore.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JitArm64_LoadStore.cpp; sourceTree = ""; }; + 55508FF327FA815E00CA618C /* BackPatch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BackPatch.h; sourceTree = ""; }; + 55508FF427FA818E00CA618C /* JitARCH.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JitARCH.cpp; sourceTree = ""; }; + 55508FF627FA888B00CA618C /* WiimoteSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WiimoteSettings.h; sourceTree = ""; }; + 55508FF727FA888B00CA618C /* WiimoteSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WiimoteSettings.cpp; sourceTree = ""; }; + 55508FF927FA8AAB00CA618C /* DefaultLocale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DefaultLocale.h; sourceTree = ""; }; + 55508FFA27FA8AAB00CA618C /* DefaultLocale.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DefaultLocale.cpp; sourceTree = ""; }; + 55508FFB27FA8AAC00CA618C /* SessionSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionSettings.h; sourceTree = ""; }; + 55508FFC27FA8AAC00CA618C /* SessionSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SessionSettings.cpp; sourceTree = ""; }; + 55508FFF27FA8AF400CA618C /* DolphinAnalytics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DolphinAnalytics.cpp; sourceTree = ""; }; + 5550900027FA8AF400CA618C /* DolphinAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DolphinAnalytics.h; sourceTree = ""; }; + 5550900227FA8B4700CA618C /* NetworkCaptureLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCaptureLogger.h; sourceTree = ""; }; + 5550900327FA8B4700CA618C /* NetworkCaptureLogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCaptureLogger.cpp; sourceTree = ""; }; + 5550900827FA8C6600CA618C /* filter_neon_intrinsics.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = filter_neon_intrinsics.c; sourceTree = ""; }; + 5550900927FA8C6600CA618C /* arm_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = arm_init.c; sourceTree = ""; }; + 5550900A27FA8C6600CA618C /* palette_neon_intrinsics.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = palette_neon_intrinsics.c; sourceTree = ""; }; + 5550900F27FA8CD800CA618C /* TMEM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TMEM.cpp; sourceTree = ""; }; + 5550901027FA8CD800CA618C /* TMEM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TMEM.h; sourceTree = ""; }; + 5550901227FA8D9300CA618C /* RiivolutionPatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RiivolutionPatcher.cpp; sourceTree = ""; }; + 5550901327FA8D9400CA618C /* RiivolutionParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RiivolutionParser.h; sourceTree = ""; }; + 5550901427FA8D9400CA618C /* RiivolutionPatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RiivolutionPatcher.h; sourceTree = ""; }; + 5550901527FA8D9400CA618C /* RiivolutionParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RiivolutionParser.cpp; sourceTree = ""; }; + 5550901827FA8F5D00CA618C /* ImageC.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ImageC.c; sourceTree = ""; }; + 5550901927FA8F5D00CA618C /* ImageC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageC.h; sourceTree = ""; }; + 5550901B27FA8FBA00CA618C /* SWBoundingBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SWBoundingBox.cpp; sourceTree = ""; }; + 5550901C27FA8FBA00CA618C /* SWBoundingBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWBoundingBox.h; sourceTree = ""; }; + 5550901E27FA903800CA618C /* DiscUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DiscUtils.cpp; sourceTree = ""; }; + 5550901F27FA903800CA618C /* DiscUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiscUtils.h; sourceTree = ""; }; + 5550902127FA905400CA618C /* GameModDescriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GameModDescriptor.cpp; sourceTree = ""; }; + 5550902227FA905400CA618C /* GameModDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameModDescriptor.h; sourceTree = ""; }; + 5550902427FA914000CA618C /* FileSystemCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSystemCommon.cpp; sourceTree = ""; }; + 5550902627FA989A00CA618C /* imgui_tables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imgui_tables.cpp; sourceTree = ""; }; + 5550902827FA98F700CA618C /* TextureInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureInfo.cpp; sourceTree = ""; }; + 5550902927FA98F700CA618C /* TextureInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureInfo.h; sourceTree = ""; }; + 5550907027FA9F8500CA618C /* DITConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DITConfiguration.h; sourceTree = ""; }; + 5550907127FA9F8500CA618C /* DITConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DITConfiguration.cpp; sourceTree = ""; }; + 5550907227FA9F8500CA618C /* DITSpecification.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DITSpecification.cpp; sourceTree = ""; }; + 5550907327FA9F8500CA618C /* DITData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DITData.h; sourceTree = ""; }; + 5550907427FA9F8500CA618C /* DITSpecification.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DITSpecification.h; sourceTree = ""; }; + 5550907727FA9FEC00CA618C /* GBAPad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GBAPad.cpp; sourceTree = ""; }; + 5550907827FA9FEC00CA618C /* GBACore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GBACore.h; sourceTree = ""; }; + 5550907927FA9FEC00CA618C /* GBAPadEmu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GBAPadEmu.h; sourceTree = ""; }; + 5550907A27FA9FEC00CA618C /* GBACore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GBACore.cpp; sourceTree = ""; }; + 5550907B27FA9FEC00CA618C /* GBAPadEmu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GBAPadEmu.cpp; sourceTree = ""; }; + 5550907C27FA9FED00CA618C /* GBAPad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GBAPad.h; sourceTree = ""; }; + 5550908127FAA0D100CA618C /* DivUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DivUtils.h; sourceTree = ""; }; + 5550908227FAA0D100CA618C /* DivUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DivUtils.cpp; sourceTree = ""; }; + 5550908427FAA30100CA618C /* SocketContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SocketContext.cpp; sourceTree = ""; }; + 5550908527FAA30100CA618C /* SocketContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketContext.h; sourceTree = ""; }; + 5550908727FAA35E00CA618C /* NetPlayCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetPlayCommon.h; sourceTree = ""; }; + 5550908827FAA35E00CA618C /* NetPlayCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetPlayCommon.cpp; sourceTree = ""; }; + 5550908B27FAA66900CA618C /* WiimoteController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WiimoteController.cpp; sourceTree = ""; }; 57799651D35F4D0F946361A2 /* libpng-dol.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libpng-dol.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 5AE2ADF9B49F4F4EB95615D5 /* libcommon-dol.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libcommon-dol.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 6C0C8A955FC946C29B9EDABF /* libcore-dol.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libcore-dol.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -3096,7 +3010,6 @@ EE149BA3205A270E008D5DDE /* DSPJitArithmetic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DSPJitArithmetic.cpp; sourceTree = ""; }; EE1FAE8F20AD027000748BE0 /* WiiSave.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WiiSave.h; sourceTree = ""; }; EE1FAE9020AD027000748BE0 /* WiiSave.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WiiSave.cpp; sourceTree = ""; }; - EE3A45F322B5D9D700031B56 /* time.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = time.h; sourceTree = ""; }; EE3A45F422B5D9D700031B56 /* ostream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ostream.h; sourceTree = ""; }; EE3A45F522B5D9D700031B56 /* format-inl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "format-inl.h"; sourceTree = ""; }; EE3A45F622B5D9D700031B56 /* ranges.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ranges.h; sourceTree = ""; }; @@ -3105,7 +3018,6 @@ EE3A45F922B5D9D700031B56 /* chrono.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = chrono.h; sourceTree = ""; }; EE3A45FA22B5D9D700031B56 /* color.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = color.h; sourceTree = ""; }; EE3A45FB22B5D9D700031B56 /* printf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = printf.h; sourceTree = ""; }; - EE3A45FC22B5D9D700031B56 /* posix.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = posix.h; sourceTree = ""; }; EE3A45FD22B5D9D700031B56 /* format.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = format.h; sourceTree = ""; }; EE3A460022B5D9D700031B56 /* Android.mk */ = {isa = PBXFileReference; lastKnownFileType = text; path = Android.mk; sourceTree = ""; }; EE3A460222B5D9D700031B56 /* fmt.pc.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = fmt.pc.in; sourceTree = ""; }; @@ -3173,26 +3085,26 @@ EE3CCF9F205DF94000F0D04F /* GameFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameFile.h; sourceTree = ""; }; EE3EC3EF224A827B00BA7436 /* NetPlayChatUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetPlayChatUI.h; sourceTree = ""; }; EE3EC3F0224A827B00BA7436 /* NetPlayChatUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetPlayChatUI.cpp; sourceTree = ""; }; - EE3EC3F7224A9F5500BA7436 /* BoundingBox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BoundingBox.h; sourceTree = ""; }; + EE3EC3F7224A9F5500BA7436 /* VKBoundingBox.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VKBoundingBox.h; sourceTree = ""; }; EE3EC3F8224A9F5500BA7436 /* StagingBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StagingBuffer.cpp; sourceTree = ""; }; EE3EC3F9224A9F5500BA7436 /* ObjectCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ObjectCache.h; sourceTree = ""; }; - EE3EC3FA224A9F5500BA7436 /* SwapChain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwapChain.h; sourceTree = ""; }; - EE3EC3FB224A9F5600BA7436 /* Renderer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Renderer.h; sourceTree = ""; }; - EE3EC3FC224A9F5600BA7436 /* VertexManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VertexManager.cpp; sourceTree = ""; }; + EE3EC3FA224A9F5500BA7436 /* VKSwapChain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VKSwapChain.h; sourceTree = ""; }; + EE3EC3FB224A9F5600BA7436 /* VKRenderer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VKRenderer.h; sourceTree = ""; }; + EE3EC3FC224A9F5600BA7436 /* VKVertexManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VKVertexManager.cpp; sourceTree = ""; }; EE3EC3FD224A9F5600BA7436 /* StateTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StateTracker.h; sourceTree = ""; }; EE3EC3FE224A9F5600BA7436 /* VKShader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VKShader.h; sourceTree = ""; }; - EE3EC3FF224A9F5600BA7436 /* Renderer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Renderer.cpp; sourceTree = ""; }; + EE3EC3FF224A9F5600BA7436 /* VKRenderer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VKRenderer.cpp; sourceTree = ""; }; EE3EC400224A9F5600BA7436 /* VKPipeline.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VKPipeline.cpp; sourceTree = ""; }; - EE3EC401224A9F5700BA7436 /* PerfQuery.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PerfQuery.h; sourceTree = ""; }; - EE3EC402224A9F5700BA7436 /* VertexManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VertexManager.h; sourceTree = ""; }; + EE3EC401224A9F5700BA7436 /* VKPerfQuery.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VKPerfQuery.h; sourceTree = ""; }; + EE3EC402224A9F5700BA7436 /* VKVertexManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VKVertexManager.h; sourceTree = ""; }; EE3EC403224A9F5700BA7436 /* VKShader.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VKShader.cpp; sourceTree = ""; }; - EE3EC404224A9F5700BA7436 /* VertexFormat.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VertexFormat.cpp; sourceTree = ""; }; + EE3EC404224A9F5700BA7436 /* VKVertexFormat.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VKVertexFormat.cpp; sourceTree = ""; }; EE3EC405224A9F5700BA7436 /* VKTexture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VKTexture.h; sourceTree = ""; }; EE3EC406224A9F5700BA7436 /* VKTexture.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VKTexture.cpp; sourceTree = ""; }; EE3EC407224A9F5700BA7436 /* StagingBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StagingBuffer.h; sourceTree = ""; }; EE3EC408224A9F5800BA7436 /* VulkanContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VulkanContext.h; sourceTree = ""; }; EE3EC409224A9F5800BA7436 /* VulkanEntryPoints.inl */ = {isa = PBXFileReference; lastKnownFileType = text; path = VulkanEntryPoints.inl; sourceTree = ""; }; - EE3EC40A224A9F5800BA7436 /* VertexFormat.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VertexFormat.h; sourceTree = ""; }; + EE3EC40A224A9F5800BA7436 /* VKVertexFormat.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VKVertexFormat.h; sourceTree = ""; }; EE3EC40B224A9F5800BA7436 /* ShaderCompiler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShaderCompiler.h; sourceTree = ""; }; EE3EC40C224A9F5800BA7436 /* ShaderCompiler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ShaderCompiler.cpp; sourceTree = ""; }; EE3EC40D224A9F5800BA7436 /* ObjectCache.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ObjectCache.cpp; sourceTree = ""; }; @@ -3200,16 +3112,16 @@ EE3EC40F224A9F5900BA7436 /* VulkanLoader.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VulkanLoader.cpp; sourceTree = ""; }; EE3EC410224A9F5900BA7436 /* Constants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = ""; }; EE3EC411224A9F5900BA7436 /* VulkanContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VulkanContext.cpp; sourceTree = ""; }; - EE3EC412224A9F5900BA7436 /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; + EE3EC412224A9F5900BA7436 /* VKMain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VKMain.cpp; sourceTree = ""; }; EE3EC413224A9F5900BA7436 /* StateTracker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StateTracker.cpp; sourceTree = ""; }; EE3EC414224A9F5A00BA7436 /* VideoBackend.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VideoBackend.h; sourceTree = ""; }; EE3EC415224A9F5A00BA7436 /* CommandBufferManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommandBufferManager.h; sourceTree = ""; }; EE3EC416224A9F5A00BA7436 /* VulkanLoader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VulkanLoader.h; sourceTree = ""; }; - EE3EC417224A9F5A00BA7436 /* BoundingBox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = BoundingBox.cpp; sourceTree = ""; }; - EE3EC418224A9F5A00BA7436 /* StreamBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StreamBuffer.cpp; sourceTree = ""; }; - EE3EC419224A9F5A00BA7436 /* SwapChain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SwapChain.cpp; sourceTree = ""; }; - EE3EC41A224A9F5A00BA7436 /* PerfQuery.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PerfQuery.cpp; sourceTree = ""; }; - EE3EC41B224A9F5B00BA7436 /* StreamBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StreamBuffer.h; sourceTree = ""; }; + EE3EC417224A9F5A00BA7436 /* VKBoundingBox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VKBoundingBox.cpp; sourceTree = ""; }; + EE3EC418224A9F5A00BA7436 /* VKStreamBuffer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VKStreamBuffer.cpp; sourceTree = ""; }; + EE3EC419224A9F5A00BA7436 /* VKSwapChain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VKSwapChain.cpp; sourceTree = ""; }; + EE3EC41A224A9F5A00BA7436 /* VKPerfQuery.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VKPerfQuery.cpp; sourceTree = ""; }; + EE3EC41B224A9F5B00BA7436 /* VKStreamBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VKStreamBuffer.h; sourceTree = ""; }; EE3EC41C224A9F5B00BA7436 /* CommandBufferManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CommandBufferManager.cpp; sourceTree = ""; }; EE3EC435224AA01500BA7436 /* libvideovulkan-dol.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libvideovulkan-dol.a"; sourceTree = BUILT_PRODUCTS_DIR; }; EE45F43522B552A900C5D0C0 /* VolumeVerifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VolumeVerifier.cpp; sourceTree = ""; }; @@ -3289,9 +3201,9 @@ EE6ABE55239C36D7005E5F7D /* FunctionExpression.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FunctionExpression.cpp; sourceTree = ""; }; EE6ABE56239C36D7005E5F7D /* FunctionExpression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FunctionExpression.h; sourceTree = ""; }; EE6ABE5A239C3723005E5F7D /* ControllerInterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ControllerInterface.cpp; sourceTree = ""; }; - EE6ABE5B239C3723005E5F7D /* Device.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Device.cpp; sourceTree = ""; }; + EE6ABE5B239C3723005E5F7D /* CoreDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CoreDevice.cpp; sourceTree = ""; }; EE6ABE5C239C3723005E5F7D /* ControllerInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ControllerInterface.h; sourceTree = ""; }; - EE6ABE5D239C3723005E5F7D /* Device.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Device.h; sourceTree = ""; }; + EE6ABE5D239C3723005E5F7D /* CoreDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreDevice.h; sourceTree = ""; }; EE6ABE60239C3738005E5F7D /* ForceFeedbackDevice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ForceFeedbackDevice.cpp; sourceTree = ""; }; EE6ABE61239C3738005E5F7D /* ForceFeedbackDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ForceFeedbackDevice.h; sourceTree = ""; }; EE6ABE63239C3746005E5F7D /* DirectInputAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectInputAdapter.h; sourceTree = ""; }; @@ -3338,7 +3250,6 @@ EE6ABEA1239C7873005E5F7D /* File.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = File.cpp; sourceTree = ""; }; EE6ABEA2239C7873005E5F7D /* FS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FS.cpp; sourceTree = ""; }; EE6ABEA3239C7873005E5F7D /* FS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FS.h; sourceTree = ""; }; - EE6ABEA6239C787D005E5F7D /* FileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSystem.cpp; sourceTree = ""; }; EE6ABEA7239C787E005E5F7D /* FileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSystem.h; sourceTree = ""; }; EE6ABEA8239C787E005E5F7D /* FileSystemProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSystemProxy.cpp; sourceTree = ""; }; EE6ABEA9239C787E005E5F7D /* FileSystemProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSystemProxy.h; sourceTree = ""; }; @@ -3417,9 +3328,7 @@ EE79F8A525A7685F00EE9AAC /* FreeLookSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FreeLookSettings.h; sourceTree = ""; }; EE79F8A625A7685F00EE9AAC /* FreeLookSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FreeLookSettings.cpp; sourceTree = ""; }; EE79F8D525A768BD00EE9AAC /* DynamicInputTextureManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DynamicInputTextureManager.cpp; sourceTree = ""; }; - EE79F8D625A768BD00EE9AAC /* DynamicInputTextureConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicInputTextureConfiguration.h; sourceTree = ""; }; EE79F8D725A768BD00EE9AAC /* ImageOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageOperations.cpp; sourceTree = ""; }; - EE79F8D825A768BE00EE9AAC /* DynamicInputTextureConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DynamicInputTextureConfiguration.cpp; sourceTree = ""; }; EE79F8D925A768BE00EE9AAC /* DynamicInputTextureManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicInputTextureManager.h; sourceTree = ""; }; EE79F8DA25A768BE00EE9AAC /* ImageOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageOperations.h; sourceTree = ""; }; EE79F9BC25A769E500EE9AAC /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; @@ -3764,8 +3673,7 @@ EE98C04724B9268400FFFDD7 /* TAP_Apple.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TAP_Apple.cpp; sourceTree = ""; }; EE98C04824B9268400FFFDD7 /* TAP_Win32.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TAP_Win32.h; sourceTree = ""; }; EE98C04924B9268400FFFDD7 /* XLINK_KAI_BBA.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = XLINK_KAI_BBA.cpp; sourceTree = ""; }; - EE98C04C24B92AD900FFFDD7 /* Wiimote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Wiimote.h; sourceTree = ""; }; - EE98C04D24B92AD900FFFDD7 /* Wiimote.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Wiimote.cpp; sourceTree = ""; }; + EE98C04C24B92AD900FFFDD7 /* WiimoteController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WiimoteController.h; sourceTree = ""; }; EE98C04F24B92B5100FFFDD7 /* Threads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Threads.h; sourceTree = ""; }; EE9C006820A4F93F00312609 /* Watches.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Watches.h; sourceTree = ""; }; EE9C006920A4F93F00312609 /* Watches.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Watches.cpp; sourceTree = ""; }; @@ -3788,7 +3696,7 @@ EED5036724F039B600970E7D /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; }; EEE07D3322C26CD7006D46FD /* OpenEmuAudioStream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenEmuAudioStream.h; sourceTree = ""; }; EEE07D3422C26D0A006D46FD /* OpenEmuAudioStream.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenEmuAudioStream.mm; sourceTree = ""; }; - EEE07D3622C26DA7006D46FD /* AudioCommon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AudioCommon.cpp; sourceTree = ""; }; + EEE07D3622C26DA7006D46FD /* AudioCommon.cpp */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioCommon.cpp; sourceTree = ""; }; EEE07D3E22C43C40006D46FD /* ControllerInterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ControllerInterface.cpp; sourceTree = ""; }; EEE07D3F22C43C40006D46FD /* InputConfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InputConfig.cpp; sourceTree = ""; }; EEE07D4222C43C52006D46FD /* ConfigManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConfigManager.cpp; sourceTree = ""; }; @@ -4161,6 +4069,7 @@ 3E89F4761CCA7A0D00EAE7AC /* Video */, EED5036124F0373000970E7D /* VideoCommon */, ); + indentWidth = 2; name = Compatibilty; path = Compatibility; sourceTree = ""; @@ -4349,16 +4258,10 @@ 3E3D71F11C82B0F800091C4D /* FifoPlayer */ = { isa = PBXGroup; children = ( - 3E3D71F21C82B0F800091C4D /* FifoAnalyzer.cpp */, - 3E3D71F31C82B0F800091C4D /* FifoAnalyzer.h */, 3E3D71F41C82B0F800091C4D /* FifoDataFile.cpp */, 3E3D71F51C82B0F800091C4D /* FifoDataFile.h */, - 3E3D71F71C82B0F800091C4D /* FifoPlaybackAnalyzer.cpp */, - 3E3D71F81C82B0F800091C4D /* FifoPlaybackAnalyzer.h */, 3E3D71F91C82B0F800091C4D /* FifoPlayer.cpp */, 3E3D71FA1C82B0F800091C4D /* FifoPlayer.h */, - 3E3D71FB1C82B0F800091C4D /* FifoRecordAnalyzer.cpp */, - 3E3D71FC1C82B0F800091C4D /* FifoRecordAnalyzer.h */, 3E3D71FD1C82B0F800091C4D /* FifoRecorder.cpp */, 3E3D71FE1C82B0F800091C4D /* FifoRecorder.h */, ); @@ -4399,6 +4302,12 @@ 3E3D720F1C82B0F800091C4D /* AudioInterface.h */, 3E3D72151C82B0F800091C4D /* CPU.cpp */, 3E3D72161C82B0F800091C4D /* CPU.h */, + 5550907A27FA9FEC00CA618C /* GBACore.cpp */, + 5550907827FA9FEC00CA618C /* GBACore.h */, + 5550907727FA9FEC00CA618C /* GBAPad.cpp */, + 5550907C27FA9FED00CA618C /* GBAPad.h */, + 5550907B27FA9FEC00CA618C /* GBAPadEmu.cpp */, + 5550907927FA9FEC00CA618C /* GBAPadEmu.h */, 3E3D72171C82B0F900091C4D /* DSP.cpp */, 3E3D72181C82B0F900091C4D /* DSP.h */, 3E3D72191C82B0F900091C4D /* DSPHLE */, @@ -4483,8 +4392,6 @@ 3E3D72341C82B0F900091C4D /* DSPHost.cpp */, 3E3D72351C82B0F900091C4D /* DSPLLE.cpp */, 3E3D72361C82B0F900091C4D /* DSPLLE.h */, - 3E3D72371C82B0F900091C4D /* DSPLLEGlobals.cpp */, - 3E3D72381C82B0F900091C4D /* DSPLLEGlobals.h */, 3E3D723B1C82B0F900091C4D /* DSPSymbols.cpp */, 3E3D723C1C82B0F900091C4D /* DSPSymbols.h */, ); @@ -4494,24 +4401,25 @@ 3E3D72E31C82B0F900091C4D /* PowerPC */ = { isa = PBXGroup; children = ( - EE8DD29E22493464005E1AF5 /* ConditionRegister.cpp */, - EE8DD29D22493464005E1AF5 /* ConditionRegister.h */, - EE7D6ED621408760004EDA2F /* MMU.h */, - 3EFF26EF1F845E9F00B4FD11 /* CachedInterpreter */, - 3EFF26F41F845E9F00B4FD11 /* SignatureDB */, 3E8EC6DD1F84378D00D79F27 /* BreakPoints.cpp */, 3E8EC6DC1F84378C00D79F27 /* BreakPoints.h */, + 3EFF26EF1F845E9F00B4FD11 /* CachedInterpreter */, + EE8DD29E22493464005E1AF5 /* ConditionRegister.cpp */, + EE8DD29D22493464005E1AF5 /* ConditionRegister.h */, + 3E3D72E61C82B0F900091C4D /* CPUCoreBase.h */, 3E8EC6DE1F84378D00D79F27 /* GDBStub.cpp */, 3E8EC6DF1F84378E00D79F27 /* GDBStub.h */, - 3E3D72E61C82B0F900091C4D /* CPUCoreBase.h */, 3E3D72E91C82B0F900091C4D /* Gekko.h */, 3E3D72EA1C82B0F900091C4D /* Interpreter */, 3E3D72F71C82B0F900091C4D /* Jit64 */, 3E3D73081C82B0F900091C4D /* Jit64Common */, + 55508FDE27FA815E00CA618C /* JitArm64 */, + 55508FF227FA815E00CA618C /* JitArmCommon */, 3E3D73291C82B0F900091C4D /* JitCommon */, 3E3D73411C82B0F900091C4D /* JitInterface.cpp */, 3E3D73421C82B0F900091C4D /* JitInterface.h */, 3E3D73431C82B0F900091C4D /* MMU.cpp */, + EE7D6ED621408760004EDA2F /* MMU.h */, 3E3D73441C82B0F900091C4D /* PowerPC.cpp */, 3E3D73451C82B0F900091C4D /* PowerPC.h */, 3E3D73461C82B0F900091C4D /* PPCAnalyst.cpp */, @@ -4523,6 +4431,7 @@ 3E3D734C1C82B0F900091C4D /* PPCTables.cpp */, 3E3D734D1C82B0F900091C4D /* PPCTables.h */, 3E3D734F1C82B0F900091C4D /* Profiler.h */, + 3EFF26F41F845E9F00B4FD11 /* SignatureDB */, ); path = PowerPC; sourceTree = ""; @@ -4570,7 +4479,6 @@ 3E3D73081C82B0F900091C4D /* Jit64Common */ = { isa = PBXGroup; children = ( - EE8DD2AC22493491005E1AF5 /* Jit64Constants.h */, 3E8EC6CE1F84376B00D79F27 /* BlockCache.cpp */, 3E8EC6CB1F84376B00D79F27 /* BlockCache.h */, 3E8EC6C81F84376900D79F27 /* ConstantPool.cpp */, @@ -4579,12 +4487,13 @@ 3E8EC6C91F84376A00D79F27 /* EmuCodeBlock.h */, 3E8EC6C61F84376900D79F27 /* FarCodeCache.cpp */, 3E8EC6C51F84376900D79F27 /* FarCodeCache.h */, + 3E3D73091C82B0F900091C4D /* Jit64AsmCommon.cpp */, + 3E3D730A1C82B0F900091C4D /* Jit64AsmCommon.h */, + EE8DD2AC22493491005E1AF5 /* Jit64Constants.h */, 3E8EC6C21F84376800D79F27 /* Jit64PowerPCState.h */, 3E8EC6C41F84376900D79F27 /* TrampolineCache.cpp */, 3E8EC6CC1F84376B00D79F27 /* TrampolineCache.h */, 3E8EC6CF1F84376C00D79F27 /* TrampolineInfo.h */, - 3E3D73091C82B0F900091C4D /* Jit64AsmCommon.cpp */, - 3E3D730A1C82B0F900091C4D /* Jit64AsmCommon.h */, ); path = Jit64Common; sourceTree = ""; @@ -4592,6 +4501,8 @@ 3E3D73291C82B0F900091C4D /* JitCommon */ = { isa = PBXGroup; children = ( + 5550908227FAA0D100CA618C /* DivUtils.cpp */, + 5550908127FAA0D100CA618C /* DivUtils.h */, 3E3D732C1C82B0F900091C4D /* JitAsmCommon.cpp */, 3E3D732D1C82B0F900091C4D /* JitAsmCommon.h */, 3E3D732F1C82B0F900091C4D /* JitBase.cpp */, @@ -4733,7 +4644,7 @@ 3E89F4761CCA7A0D00EAE7AC /* Video */ = { isa = PBXGroup; children = ( - 3E89F4831CCE8AC600EAE7AC /* Render.cpp */, + 3E89F4831CCE8AC600EAE7AC /* OGLRender.cpp */, 3E3D70261C82AF2A00091C4D /* AGL.mm */, ); path = Video; @@ -4829,13 +4740,13 @@ 3E8EC5921F842CB500D79F27 /* ControllerEmu */ = { isa = PBXGroup; children = ( + 3E8EC5B21F842CB500D79F27 /* Control */, + 3E8EC5951F842CB500D79F27 /* ControlGroup */, EE6ABE4E239C36C4005E5F7D /* ControllerEmu.cpp */, EE6ABE4D239C36C4005E5F7D /* ControllerEmu.h */, + 3E8EC5AC1F842CB500D79F27 /* Setting */, EE6ABE4B239C36C3005E5F7D /* StickGate.cpp */, EE6ABE4C239C36C3005E5F7D /* StickGate.h */, - 3E8EC5951F842CB500D79F27 /* ControlGroup */, - 3E8EC5AC1F842CB500D79F27 /* Setting */, - 3E8EC5B21F842CB500D79F27 /* Control */, ); path = ControllerEmu; sourceTree = ""; @@ -4917,8 +4828,8 @@ EE6ABE75239C7116005E5F7D /* DualShockUDPClient */, EE6ABE5A239C3723005E5F7D /* ControllerInterface.cpp */, EE6ABE5C239C3723005E5F7D /* ControllerInterface.h */, - EE6ABE5B239C3723005E5F7D /* Device.cpp */, - EE6ABE5D239C3723005E5F7D /* Device.h */, + EE6ABE5B239C3723005E5F7D /* CoreDevice.cpp */, + EE6ABE5D239C3723005E5F7D /* CoreDevice.h */, 3EFF29261F8561E900B4FD11 /* Quartz */, 3E8EC5DC1F842CFC00D79F27 /* OSX */, 3E8EC5E61F842CFC00D79F27 /* Pipes */, @@ -5070,11 +4981,8 @@ 3E8EC6761F8434C600D79F27 /* WiimoteReal */ = { isa = PBXGroup; children = ( - 3E8EC6771F8434C600D79F27 /* IOdarwin_private.h */, - 3E8EC6781F8434C600D79F27 /* IOdarwin.mm */, 3E8EC6791F8434C600D79F27 /* WiimoteReal.cpp */, 3E8EC67A1F8434C600D79F27 /* WiimoteReal.h */, - 3E8EC67C1F8434C600D79F27 /* IOdarwin.h */, 3E8EC67D1F8434C600D79F27 /* IOhidapi.cpp */, 3E8EC6821F8434C600D79F27 /* IOhidapi.h */, 3E8EC6831F8434C600D79F27 /* IODummy.h */, @@ -5189,18 +5097,24 @@ 3EFF262D1F845CA400B4FD11 /* Config */ = { isa = PBXGroup; children = ( + 55508FFA27FA8AAB00CA618C /* DefaultLocale.cpp */, + 55508FF927FA8AAB00CA618C /* DefaultLocale.h */, EE79F8A625A7685F00EE9AAC /* FreeLookSettings.cpp */, EE79F8A525A7685F00EE9AAC /* FreeLookSettings.h */, - EE68206721053AFC008D5405 /* UISettings.cpp */, - EE68206621053AFC008D5405 /* UISettings.h */, - 3EFF262E1F845CA400B4FD11 /* SYSCONFSettings.cpp */, - 3EFF262F1F845CA400B4FD11 /* NetplaySettings.h */, - 3EFF26301F845CA400B4FD11 /* GraphicsSettings.h */, - 3EFF26311F845CA400B4FD11 /* NetplaySettings.cpp */, - 3EFF26321F845CA400B4FD11 /* SYSCONFSettings.h */, 3EFF26331F845CA400B4FD11 /* GraphicsSettings.cpp */, + 3EFF26301F845CA400B4FD11 /* GraphicsSettings.h */, 3EFF26341F845CA400B4FD11 /* MainSettings.cpp */, 3EFF26351F845CA400B4FD11 /* MainSettings.h */, + 3EFF26311F845CA400B4FD11 /* NetplaySettings.cpp */, + 3EFF262F1F845CA400B4FD11 /* NetplaySettings.h */, + 55508FFC27FA8AAC00CA618C /* SessionSettings.cpp */, + 55508FFB27FA8AAC00CA618C /* SessionSettings.h */, + 3EFF262E1F845CA400B4FD11 /* SYSCONFSettings.cpp */, + 3EFF26321F845CA400B4FD11 /* SYSCONFSettings.h */, + EE68206721053AFC008D5405 /* UISettings.cpp */, + EE68206621053AFC008D5405 /* UISettings.h */, + 55508FF727FA888B00CA618C /* WiimoteSettings.cpp */, + 55508FF627FA888B00CA618C /* WiimoteSettings.h */, ); path = Config; sourceTree = ""; @@ -5229,25 +5143,25 @@ EE6ABE84239C7829005E5F7D /* Device.h */, EE6ABE82239C7829005E5F7D /* DeviceStub.cpp */, EE6ABE83239C7829005E5F7D /* DeviceStub.h */, + 3EFF264C1F845CB700B4FD11 /* DI */, EE6ABE7A239C7827005E5F7D /* DolphinDevice.cpp */, EE6ABE81239C7828005E5F7D /* DolphinDevice.h */, + 3EFF26A11F845CB700B4FD11 /* ES */, + 3EFF26B41F845CB700B4FD11 /* FS */, EE6ABE7B239C7827005E5F7D /* IOS.cpp */, EE6ABE87239C7829005E5F7D /* IOS.h */, EE6ABE7C239C7828005E5F7D /* IOSC.cpp */, EE6ABE86239C7829005E5F7D /* IOSC.h */, EE6ABE80239C7828005E5F7D /* MIOS.cpp */, EE6ABE7F239C7828005E5F7D /* MIOS.h */, + 3EFF26531F845CB700B4FD11 /* Network */, + 3EFF26AC1F845CB700B4FD11 /* SDIO */, + 3EFF26711F845CB700B4FD11 /* STM */, EE6ABE7E239C7828005E5F7D /* Uids.h */, + 3EFF26751F845CB700B4FD11 /* USB */, EE6ABE7D239C7828005E5F7D /* VersionInfo.cpp */, EE6ABE88239C7829005E5F7D /* VersionInfo.h */, - 3EFF264C1F845CB700B4FD11 /* DI */, - 3EFF26531F845CB700B4FD11 /* Network */, - 3EFF26711F845CB700B4FD11 /* STM */, - 3EFF26751F845CB700B4FD11 /* USB */, - 3EFF26A11F845CB700B4FD11 /* ES */, - 3EFF26AC1F845CB700B4FD11 /* SDIO */, 3EFF26AF1F845CB700B4FD11 /* WFS */, - 3EFF26B41F845CB700B4FD11 /* FS */, ); path = IOS; sourceTree = ""; @@ -5266,16 +5180,16 @@ children = ( EE6ABE95239C7857005E5F7D /* ICMP.h */, EE6ABE9B239C7858005E5F7D /* ICMPLin.cpp */, + 3EFF266A1F845CB700B4FD11 /* IP */, + 3EFF265A1F845CB700B4FD11 /* KD */, EE6ABE93239C7856005E5F7D /* MACUtils.cpp */, EE6ABE98239C7857005E5F7D /* MACUtils.h */, + 3EFF26551F845CB700B4FD11 /* NCD */, EE6ABE96239C7857005E5F7D /* Socket.cpp */, EE6ABE9A239C7858005E5F7D /* Socket.h */, EE6ABE94239C7857005E5F7D /* SSL.cpp */, EE6ABE97239C7857005E5F7D /* SSL.h */, - 3EFF26551F845CB700B4FD11 /* NCD */, - 3EFF265A1F845CB700B4FD11 /* KD */, 3EFF26641F845CB700B4FD11 /* WD */, - 3EFF266A1F845CB700B4FD11 /* IP */, ); path = Network; sourceTree = ""; @@ -5334,22 +5248,22 @@ 3EFF26751F845CB700B4FD11 /* USB */ = { isa = PBXGroup; children = ( + 3EFF268A1F845CB700B4FD11 /* Bluetooth */, EE6ABECA239C78CF005E5F7D /* Common.cpp */, EE6ABECF239C78D0005E5F7D /* Common.h */, EE6ABED2239C78D0005E5F7D /* Host.cpp */, EE6ABECE239C78D0005E5F7D /* Host.h */, + 3EFF26841F845CB700B4FD11 /* OH0 */, + 3EFF26791F845CB700B4FD11 /* USB_HID */, EE6ABEC9239C78CF005E5F7D /* USB_KBD.cpp */, EE6ABED3239C78D1005E5F7D /* USB_KBD.h */, + 3EFF269B1F845CB700B4FD11 /* USB_VEN */, EE6ABED0239C78D0005E5F7D /* USBV0.cpp */, EE6ABEC8239C78CF005E5F7D /* USBV0.h */, EE6ABECD239C78D0005E5F7D /* USBV4.cpp */, EE6ABECC239C78D0005E5F7D /* USBV4.h */, EE6ABED4239C78D1005E5F7D /* USBV5.cpp */, EE6ABED1239C78D0005E5F7D /* USBV5.h */, - 3EFF26791F845CB700B4FD11 /* USB_HID */, - 3EFF26841F845CB700B4FD11 /* OH0 */, - 3EFF268A1F845CB700B4FD11 /* Bluetooth */, - 3EFF269B1F845CB700B4FD11 /* USB_VEN */, ); path = USB; sourceTree = ""; @@ -5444,8 +5358,8 @@ 3EFF26B41F845CB700B4FD11 /* FS */ = { isa = PBXGroup; children = ( - EE6ABEA6239C787D005E5F7D /* FileSystem.cpp */, EE6ABEA7239C787E005E5F7D /* FileSystem.h */, + 5550902427FA914000CA618C /* FileSystemCommon.cpp */, EE6ABEA8239C787E005E5F7D /* FileSystemProxy.cpp */, EE6ABEA9239C787E005E5F7D /* FileSystemProxy.h */, EE32D850207ABBB90050B549 /* HostBackend */, @@ -5677,14 +5591,14 @@ isa = PBXGroup; children = ( 3EFF28DF1F85605000B4FD11 /* NullBackend.cpp */, + 3EFF28DD1F85604F00B4FD11 /* NullRender.cpp */, + 3EFF28DC1F85604F00B4FD11 /* NullRender.h */, 3EFF28DE1F85605000B4FD11 /* NullTexture.cpp */, 3EFF28D91F85604E00B4FD11 /* NullTexture.h */, + 3EFF28E41F85605100B4FD11 /* NullVertexManager.cpp */, + 3EFF28E11F85605000B4FD11 /* NullVertexManager.h */, 3EFF28E01F85605000B4FD11 /* PerfQuery.h */, - 3EFF28DD1F85604F00B4FD11 /* Render.cpp */, - 3EFF28DC1F85604F00B4FD11 /* Render.h */, 3EFF28E21F85605100B4FD11 /* TextureCache.h */, - 3EFF28E41F85605100B4FD11 /* VertexManager.cpp */, - 3EFF28E11F85605000B4FD11 /* VertexManager.h */, 3EFF28DA1F85604F00B4FD11 /* VideoBackend.h */, ); name = "Source Files"; @@ -6040,6 +5954,62 @@ path = curl; sourceTree = ""; }; + 55508FDE27FA815E00CA618C /* JitArm64 */ = { + isa = PBXGroup; + children = ( + 55508FE527FA815E00CA618C /* Jit_Util.cpp */, + 55508FE627FA815E00CA618C /* Jit_Util.h */, + 55508FE327FA815E00CA618C /* Jit.cpp */, + 55508FEA27FA815E00CA618C /* Jit.h */, + 55508FDF27FA815E00CA618C /* JitArm64_BackPatch.cpp */, + 55508FEC27FA815E00CA618C /* JitArm64_Branch.cpp */, + 55508FE227FA815E00CA618C /* JitArm64_FloatingPoint.cpp */, + 55508FE127FA815E00CA618C /* JitArm64_Integer.cpp */, + 55508FF127FA815E00CA618C /* JitArm64_LoadStore.cpp */, + 55508FE927FA815E00CA618C /* JitArm64_LoadStoreFloating.cpp */, + 55508FE827FA815E00CA618C /* JitArm64_LoadStorePaired.cpp */, + 55508FF027FA815E00CA618C /* JitArm64_Paired.cpp */, + 55508FE727FA815E00CA618C /* JitArm64_RegCache.cpp */, + 55508FEE27FA815E00CA618C /* JitArm64_RegCache.h */, + 55508FE427FA815E00CA618C /* JitArm64_SystemRegisters.cpp */, + 55508FEB27FA815E00CA618C /* JitArm64_Tables.cpp */, + 55508FE027FA815E00CA618C /* JitArm64Cache.cpp */, + 55508FED27FA815E00CA618C /* JitArm64Cache.h */, + 55508FEF27FA815E00CA618C /* JitAsm.cpp */, + ); + path = JitArm64; + sourceTree = ""; + }; + 55508FF227FA815E00CA618C /* JitArmCommon */ = { + isa = PBXGroup; + children = ( + 55508FF327FA815E00CA618C /* BackPatch.h */, + ); + path = JitArmCommon; + sourceTree = ""; + }; + 5550900627FA8C6600CA618C /* arm */ = { + isa = PBXGroup; + children = ( + 5550900927FA8C6600CA618C /* arm_init.c */, + 5550900827FA8C6600CA618C /* filter_neon_intrinsics.c */, + 5550900A27FA8C6600CA618C /* palette_neon_intrinsics.c */, + ); + path = arm; + sourceTree = ""; + }; + 5550906F27FA9F8500CA618C /* DynamicInputTextures */ = { + isa = PBXGroup; + children = ( + 5550907127FA9F8500CA618C /* DITConfiguration.cpp */, + 5550907027FA9F8500CA618C /* DITConfiguration.h */, + 5550907327FA9F8500CA618C /* DITData.h */, + 5550907227FA9F8500CA618C /* DITSpecification.cpp */, + 5550907427FA9F8500CA618C /* DITSpecification.h */, + ); + path = DynamicInputTextures; + sourceTree = ""; + }; 5731B3A7B3FF4CC498C9C49A /* common */ = { isa = PBXGroup; children = ( @@ -6080,9 +6050,6 @@ 55508FC927FA4A0F00CA618C /* ArmCommon.h */, 55508FCA27FA4A0F00CA618C /* ArmCPUDetect.cpp */, 3E3D70AD1C82B0BB00091C4D /* Assert.h */, - 3E3D70AE1C82B0BB00091C4D /* Atomic_GCC.h */, - 3E3D70AF1C82B0BB00091C4D /* Atomic_Win32.h */, - 3E3D70B01C82B0BB00091C4D /* Atomic.h */, 3E3D70B11C82B0BB00091C4D /* BitField.h */, 3E3D70B31C82B0BB00091C4D /* BitSet.h */, 3EFF25F11F8455D000B4FD11 /* BitUtils.h */, @@ -6110,8 +6077,6 @@ 3E3D70CB1C82B0BB00091C4D /* ENetUtil.cpp */, 3E3D70CC1C82B0BB00091C4D /* ENetUtil.h */, 3E3D70CD1C82B0BB00091C4D /* Event.h */, - 3EFF25F91F8455D500B4FD11 /* File.cpp */, - 3EFF25FA1F8455D500B4FD11 /* File.h */, 3E3D70CF1C82B0BB00091C4D /* FileSearch.cpp */, 3E3D70D01C82B0BB00091C4D /* FileSearch.h */, 3E3D70D11C82B0BB00091C4D /* FileUtil.cpp */, @@ -6132,9 +6097,13 @@ 3EFF25FF1F8455D700B4FD11 /* HttpRequest.h */, EE5F71A120B322F80083D8D8 /* Image.cpp */, EE5F71A020B322F70083D8D8 /* Image.h */, + 5550901827FA8F5D00CA618C /* ImageC.c */, + 5550901927FA8F5D00CA618C /* ImageC.h */, 3E3D711D1C82B0BB00091C4D /* IniFile.cpp */, 3E3D711E1C82B0BB00091C4D /* IniFile.h */, 3E3D711F1C82B0BB00091C4D /* Intrinsics.h */, + 55508FD927FA749D00CA618C /* IOFile.cpp */, + 55508FDA27FA749D00CA618C /* IOFile.h */, 3E3D71201C82B0BB00091C4D /* JitRegister.cpp */, 3E3D71211C82B0BB00091C4D /* JitRegister.h */, 3EFF25FE1F8455D700B4FD11 /* Lazy.h */, @@ -6147,10 +6116,8 @@ 3E3D712D1C82B0BB00091C4D /* MathUtil.h */, EE8DD2BD224A7D01005E1AF5 /* Matrix.cpp */, EE8DD2C0224A7D02005E1AF5 /* Matrix.h */, - 3EFF26011F8455D800B4FD11 /* MD5.cpp */, - 3EFF25F41F8455D100B4FD11 /* MD5.h */, - 3E3D712E1C82B0BB00091C4D /* MemArena.cpp */, 3E3D712F1C82B0BB00091C4D /* MemArena.h */, + 3E3D712E1C82B0BB00091C4D /* MemArenaUnix.cpp */, 3E3D71301C82B0BB00091C4D /* MemoryUtil.cpp */, 3E3D71311C82B0BB00091C4D /* MemoryUtil.h */, 3E3D71331C82B0BB00091C4D /* MsgHandler.cpp */, @@ -6179,6 +6146,8 @@ 3E3D71451C82B0BB00091C4D /* SettingsHandler.h */, EE68205A2105393C008D5405 /* SFMLHelper.cpp */, EE6820582105393C008D5405 /* SFMLHelper.h */, + 5550908427FAA30100CA618C /* SocketContext.cpp */, + 5550908527FAA30100CA618C /* SocketContext.h */, EE149B7D2059D9EC008D5DDE /* SPSCQueue.h */, 3E3D71461C82B0BB00091C4D /* StringUtil.cpp */, 3E3D71471C82B0BB00091C4D /* StringUtil.h */, @@ -6224,27 +6193,16 @@ 6D2FDDCA6C6A4DB0A094382B /* Source Files */ = { isa = PBXGroup; children = ( - EEF97BE825A77078008C4BB2 /* CheatCodes.h */, - EEF97BE525A77077008C4BB2 /* FreeLookConfig.cpp */, - EEF97BEB25A77078008C4BB2 /* FreeLookConfig.h */, - EEF97BE625A77078008C4BB2 /* FreeLookManager.cpp */, - EEF97BE925A77078008C4BB2 /* FreeLookManager.h */, - EEF97BE725A77078008C4BB2 /* SyncIdentifier.h */, - EEF97BEA25A77078008C4BB2 /* System.cpp */, - EEF97BE425A77077008C4BB2 /* System.h */, - EE45F43822B552C500C5D0C0 /* LibusbUtils.cpp */, - EE45F43922B552C500C5D0C0 /* LibusbUtils.h */, - EE9C006E20A4FA8B00312609 /* SysConf.cpp */, - EE9C006F20A4FA8C00312609 /* SysConf.h */, + 5550908827FAA35E00CA618C /* NetPlayCommon.cpp */, + 5550908727FAA35E00CA618C /* NetPlayCommon.h */, 3E3D71961C82B0F800091C4D /* ActionReplay.cpp */, 3E3D71971C82B0F800091C4D /* ActionReplay.h */, - 3E8D25F91D21D8F70086BA59 /* Analytics.cpp */, - 3E8D25FB1D21D9040086BA59 /* Analytics.h */, 3E3D71981C82B0F800091C4D /* ARDecrypt.cpp */, 3E3D71991C82B0F800091C4D /* ARDecrypt.h */, 3E3D719A1C82B0F800091C4D /* Boot */, 3E3D71A51C82B0F800091C4D /* BootManager.cpp */, 3E3D71A61C82B0F800091C4D /* BootManager.h */, + EEF97BE825A77078008C4BB2 /* CheatCodes.h */, 3EFF270B1F845F7100B4FD11 /* CommonTitles.h */, 3EFF262D1F845CA400B4FD11 /* Config */, 3EFF26361F845CA500B4FD11 /* ConfigLoaders */, @@ -6255,10 +6213,16 @@ 3E3D71AE1C82B0F800091C4D /* CoreTiming.cpp */, 3E3D71AF1C82B0F800091C4D /* CoreTiming.h */, 3E3D71B01C82B0F800091C4D /* Debugger */, + 55508FFF27FA8AF400CA618C /* DolphinAnalytics.cpp */, + 5550900027FA8AF400CA618C /* DolphinAnalytics.h */, 3E3D71B81C82B0F800091C4D /* DSP */, 3E3D71ED1C82B0F800091C4D /* DSPEmulator.cpp */, 3E3D71EE1C82B0F800091C4D /* DSPEmulator.h */, 3E3D71F11C82B0F800091C4D /* FifoPlayer */, + EEF97BE525A77077008C4BB2 /* FreeLookConfig.cpp */, + EEF97BEB25A77078008C4BB2 /* FreeLookConfig.h */, + EEF97BE625A77078008C4BB2 /* FreeLookManager.cpp */, + EEF97BE925A77078008C4BB2 /* FreeLookManager.h */, 3E3D71FF1C82B0F800091C4D /* GeckoCode.cpp */, 3E3D72001C82B0F800091C4D /* GeckoCode.h */, 3E3D72011C82B0F800091C4D /* GeckoCodeConfig.cpp */, @@ -6269,6 +6233,8 @@ 3E3D720C1C82B0F800091C4D /* HotkeyManager.h */, 3E3D720D1C82B0F800091C4D /* HW */, 3EFF264A1F845CB700B4FD11 /* IOS */, + EE45F43822B552C500C5D0C0 /* LibusbUtils.cpp */, + EE45F43922B552C500C5D0C0 /* LibusbUtils.h */, 3E3D72D51C82B0F900091C4D /* MachineContext.h */, 3E3D72D61C82B0F900091C4D /* MemoryWatcher.cpp */, 3E3D72D71C82B0F900091C4D /* MemoryWatcher.h */, @@ -6281,11 +6247,18 @@ 3E3D72DE1C82B0F900091C4D /* NetPlayProto.h */, 3E3D72DF1C82B0F900091C4D /* NetPlayServer.cpp */, 3E3D72E01C82B0F900091C4D /* NetPlayServer.h */, + 5550900327FA8B4700CA618C /* NetworkCaptureLogger.cpp */, + 5550900227FA8B4700CA618C /* NetworkCaptureLogger.h */, 3E3D72E11C82B0F900091C4D /* PatchEngine.cpp */, 3E3D72E21C82B0F900091C4D /* PatchEngine.h */, 3E3D72E31C82B0F900091C4D /* PowerPC */, 3E3D73521C82B0F900091C4D /* State.cpp */, 3E3D73531C82B0F900091C4D /* State.h */, + EEF97BE725A77078008C4BB2 /* SyncIdentifier.h */, + EE9C006E20A4FA8B00312609 /* SysConf.cpp */, + EE9C006F20A4FA8C00312609 /* SysConf.h */, + EEF97BEA25A77078008C4BB2 /* System.cpp */, + EEF97BE425A77077008C4BB2 /* System.h */, 3EFF270D1F845F7200B4FD11 /* TitleDatabase.cpp */, 3EFF270C1F845F7100B4FD11 /* TitleDatabase.h */, 3EFF270A1F845F7100B4FD11 /* WiiRoot.cpp */, @@ -6360,6 +6333,7 @@ 820A663A7D374AAD88D5128E /* Source Files */ = { isa = PBXGroup; children = ( + 5550900627FA8C6600CA618C /* arm */, 3E3D74CE1C82B1D400091C4D /* png.c */, 3E3D74CF1C82B1D400091C4D /* png.h */, 3E3D74D01C82B1D400091C4D /* pngconf.h */, @@ -6578,7 +6552,6 @@ 3E3D75BB1C82B2DE00091C4D /* RenderBase.h */, 3EFF26111F8458DE00B4FD11 /* RenderState.cpp */, 3EFF26181F8458E100B4FD11 /* RenderState.h */, - 3E1EFC851CB6AEB0001998A2 /* SamplerCommon.h */, EE149B8E2059E190008D5DDE /* ShaderCache.cpp */, EE149B932059E192008D5DDE /* ShaderCache.h */, 3EFF261F1F8458E400B4FD11 /* ShaderGenCommon.cpp */, @@ -6598,6 +6571,10 @@ 3EFF261C1F8458E300B4FD11 /* TextureDecoder_Util.h */, 3E3D75C51C82B2DE00091C4D /* TextureDecoder_x64.cpp */, 3E3D75C61C82B2DE00091C4D /* TextureDecoder.h */, + 5550902827FA98F700CA618C /* TextureInfo.cpp */, + 5550902927FA98F700CA618C /* TextureInfo.h */, + 5550900F27FA8CD800CA618C /* TMEM.cpp */, + 5550901027FA8CD800CA618C /* TMEM.h */, 3EFF26211F8458E500B4FD11 /* UberShaderCommon.cpp */, 3EFF261E1F8458E400B4FD11 /* UberShaderCommon.h */, 3EFF26201F8458E400B4FD11 /* UberShaderPixel.cpp */, @@ -6659,6 +6636,8 @@ 3E8EC5741F84235000D79F27 /* DiscExtractor.h */, 3E3D74411C82B11900091C4D /* DiscScrubber.cpp */, 3E3D74421C82B11900091C4D /* DiscScrubber.h */, + 5550901E27FA903800CA618C /* DiscUtils.cpp */, + 5550901F27FA903800CA618C /* DiscUtils.h */, 3E3D74431C82B11900091C4D /* DriveBlob.cpp */, 3E3D74441C82B11900091C4D /* DriveBlob.h */, 3E8EC56A1F84234C00D79F27 /* Enums.cpp */, @@ -6669,11 +6648,17 @@ 3E3D744A1C82B11900091C4D /* Filesystem.h */, 3E3D744B1C82B11900091C4D /* FileSystemGCWii.cpp */, 3E3D744C1C82B11900091C4D /* FileSystemGCWii.h */, + 5550902127FA905400CA618C /* GameModDescriptor.cpp */, + 5550902227FA905400CA618C /* GameModDescriptor.h */, EE98BE0F24B8F4A200FFFDD7 /* LaggedFibonacciGenerator.cpp */, EE98BE0C24B8F4A200FFFDD7 /* LaggedFibonacciGenerator.h */, EE98BE1124B8F4A200FFFDD7 /* MultithreadedCompressor.h */, 3E8EC56C1F84234D00D79F27 /* NANDImporter.cpp */, 3E8EC5691F84234C00D79F27 /* NANDImporter.h */, + 5550901527FA8D9400CA618C /* RiivolutionParser.cpp */, + 5550901327FA8D9400CA618C /* RiivolutionParser.h */, + 5550901227FA8D9300CA618C /* RiivolutionPatcher.cpp */, + 5550901427FA8D9400CA618C /* RiivolutionPatcher.h */, EE98BE1024B8F4A200FFFDD7 /* ScrubbedBlob.cpp */, EE98BE1324B8F4A300FFFDD7 /* ScrubbedBlob.h */, 3E8EC56B1F84234D00D79F27 /* TGCBlob.cpp */, @@ -6793,25 +6778,25 @@ EE149B892059E115008D5DDE /* OGLPipeline.h */, EE149B882059E115008D5DDE /* OGLShader.cpp */, EE149B8A2059E115008D5DDE /* OGLShader.h */, - 3E3D761D1C82B30A00091C4D /* BoundingBox.cpp */, - 3E3D761E1C82B30A00091C4D /* BoundingBox.h */, + 3E3D761D1C82B30A00091C4D /* OGLBoundingBox.cpp */, + 3E3D761E1C82B30A00091C4D /* OGLBoundingBox.h */, 3EFF27041F845F0200B4FD11 /* GPUTimer.h */, - 3E3D76221C82B30A00091C4D /* main.cpp */, - 3E3D76231C82B30A00091C4D /* NativeVertexFormat.cpp */, + 3E3D76221C82B30A00091C4D /* OGLMain.cpp */, + 3E3D76231C82B30A00091C4D /* OGLNativeVertexFormat.cpp */, 3EFF27051F845F0300B4FD11 /* OGLTexture.cpp */, 3EFF27031F845F0200B4FD11 /* OGLTexture.h */, - 3E3D76241C82B30A00091C4D /* PerfQuery.cpp */, - 3E3D76251C82B30A00091C4D /* PerfQuery.h */, + 3E3D76241C82B30A00091C4D /* OGLPerfQuery.cpp */, + 3E3D76251C82B30A00091C4D /* OGLPerfQuery.h */, 3E3D76281C82B30A00091C4D /* ProgramShaderCache.cpp */, 3E3D76291C82B30A00091C4D /* ProgramShaderCache.h */, - 3E3D762C1C82B30A00091C4D /* Render.cpp */, - 3E3D762D1C82B30A00091C4D /* Render.h */, + 3E3D762C1C82B30A00091C4D /* OGLRender.cpp */, + 3E3D762D1C82B30A00091C4D /* OGLRender.h */, 3E3D762E1C82B30A00091C4D /* SamplerCache.cpp */, 3E3D762F1C82B30A00091C4D /* SamplerCache.h */, - 3E3D76301C82B30A00091C4D /* StreamBuffer.cpp */, - 3E3D76311C82B30A00091C4D /* StreamBuffer.h */, - 3E3D76361C82B30A00091C4D /* VertexManager.cpp */, - 3E3D76371C82B30A00091C4D /* VertexManager.h */, + 3E3D76301C82B30A00091C4D /* OGLStreamBuffer.cpp */, + 3E3D76311C82B30A00091C4D /* OGLStreamBuffer.h */, + 3E3D76361C82B30A00091C4D /* OGLVertexManager.cpp */, + 3E3D76371C82B30A00091C4D /* OGLVertexManager.h */, 3E3D76381C82B30A00091C4D /* VideoBackend.h */, ); name = "Source Files"; @@ -6836,13 +6821,10 @@ BAE754C05C574A5A86FC1966 /* Source Files */ = { isa = PBXGroup; children = ( - EE3CCF9B205DF87400F0D04F /* CopyRegion.h */, - EE3CCF9A205DF87400F0D04F /* TextureCache.h */, - 3EFF29231F85611200B4FD11 /* SWTexture.cpp */, - 3EFF29241F85611200B4FD11 /* SWTexture.h */, 3E3D76471C82B33700091C4D /* Clipper.cpp */, 3E3D76481C82B33700091C4D /* Clipper.h */, 3E3D76491C82B33700091C4D /* CMakeLists.txt */, + EE3CCF9B205DF87400F0D04F /* CopyRegion.h */, 3E3D764A1C82B33700091C4D /* DebugUtil.cpp */, 3E3D764B1C82B33700091C4D /* DebugUtil.h */, 3E3D764C1C82B33700091C4D /* EfbCopy.cpp */, @@ -6854,15 +6836,20 @@ 3E3D76521C82B33700091C4D /* Rasterizer.h */, 3E3D76531C82B33700091C4D /* SetupUnit.cpp */, 3E3D76541C82B33700091C4D /* SetupUnit.h */, + 5550901B27FA8FBA00CA618C /* SWBoundingBox.cpp */, + 5550901C27FA8FBA00CA618C /* SWBoundingBox.h */, 3E3D76551C82B33700091C4D /* SWmain.cpp */, 3E3D76561C82B33700091C4D /* SWOGLWindow.cpp */, 3E3D76571C82B33700091C4D /* SWOGLWindow.h */, 3E3D76581C82B33700091C4D /* SWRenderer.cpp */, 3E3D76591C82B33700091C4D /* SWRenderer.h */, + 3EFF29231F85611200B4FD11 /* SWTexture.cpp */, + 3EFF29241F85611200B4FD11 /* SWTexture.h */, 3E3D765A1C82B33700091C4D /* SWVertexLoader.cpp */, 3E3D765B1C82B33700091C4D /* SWVertexLoader.h */, 3E3D765C1C82B33700091C4D /* Tev.cpp */, 3E3D765D1C82B33700091C4D /* Tev.h */, + EE3CCF9A205DF87400F0D04F /* TextureCache.h */, 3E3D765E1C82B33700091C4D /* TextureEncoder.cpp */, 3E3D765F1C82B33700091C4D /* TextureEncoder.h */, 3E3D76601C82B33700091C4D /* TextureSampler.cpp */, @@ -6947,22 +6934,21 @@ E1328FA2113A4F799315115A /* Source Files */ = { isa = PBXGroup; children = ( - EE79F8D825A768BE00EE9AAC /* DynamicInputTextureConfiguration.cpp */, - EE79F8D625A768BD00EE9AAC /* DynamicInputTextureConfiguration.h */, - EE79F8D525A768BD00EE9AAC /* DynamicInputTextureManager.cpp */, - EE79F8D925A768BE00EE9AAC /* DynamicInputTextureManager.h */, - EE79F8D725A768BD00EE9AAC /* ImageOperations.cpp */, - EE79F8DA25A768BE00EE9AAC /* ImageOperations.h */, - EE682055210538C2008D5405 /* InputProfile.cpp */, - EE682056210538C2008D5405 /* InputProfile.h */, + 3E8EC5921F842CB500D79F27 /* ControllerEmu */, 3E8EC5CF1F842CFC00D79F27 /* ControllerInterface */, 3E8EC5CA1F842CFB00D79F27 /* ControlReference */, - 3E8EC5921F842CB500D79F27 /* ControllerEmu */, + EE79F8D525A768BD00EE9AAC /* DynamicInputTextureManager.cpp */, + EE79F8D925A768BE00EE9AAC /* DynamicInputTextureManager.h */, + 5550906F27FA9F8500CA618C /* DynamicInputTextures */, 3E3D74A91C82B14B00091C4D /* GCAdapter.cpp */, 3E3D74AA1C82B14B00091C4D /* GCAdapter.h */, 3E3D74AB1C82B14B00091C4D /* GCPadStatus.h */, + EE79F8D725A768BD00EE9AAC /* ImageOperations.cpp */, + EE79F8DA25A768BE00EE9AAC /* ImageOperations.h */, 3E3D74AE1C82B14B00091C4D /* InputConfig.cpp */, 3E3D74AF1C82B14B00091C4D /* InputConfig.h */, + EE682055210538C2008D5405 /* InputProfile.cpp */, + EE682056210538C2008D5405 /* InputProfile.h */, 3E3D74B01C82B14B00091C4D /* KeyboardStatus.h */, ); name = "Source Files"; @@ -7031,17 +7017,15 @@ EE3A45F222B5D9D700031B56 /* fmt */ = { isa = PBXGroup; children = ( - EE3A45F322B5D9D700031B56 /* time.h */, - EE3A45F422B5D9D700031B56 /* ostream.h */, - EE3A45F522B5D9D700031B56 /* format-inl.h */, - EE3A45F622B5D9D700031B56 /* ranges.h */, - EE3A45F722B5D9D700031B56 /* core.h */, - EE3A45F822B5D9D700031B56 /* locale.h */, EE3A45F922B5D9D700031B56 /* chrono.h */, EE3A45FA22B5D9D700031B56 /* color.h */, - EE3A45FB22B5D9D700031B56 /* printf.h */, - EE3A45FC22B5D9D700031B56 /* posix.h */, + EE3A45F722B5D9D700031B56 /* core.h */, + EE3A45F522B5D9D700031B56 /* format-inl.h */, EE3A45FD22B5D9D700031B56 /* format.h */, + EE3A45F822B5D9D700031B56 /* locale.h */, + EE3A45F422B5D9D700031B56 /* ostream.h */, + EE3A45FB22B5D9D700031B56 /* printf.h */, + EE3A45F622B5D9D700031B56 /* ranges.h */, ); path = fmt; sourceTree = ""; @@ -7120,39 +7104,39 @@ EE3EC3F6224A9F0500BA7436 /* Sources */ = { isa = PBXGroup; children = ( - EE3EC417224A9F5A00BA7436 /* BoundingBox.cpp */, - EE3EC3F7224A9F5500BA7436 /* BoundingBox.h */, EE3EC41C224A9F5B00BA7436 /* CommandBufferManager.cpp */, EE3EC415224A9F5A00BA7436 /* CommandBufferManager.h */, EE3EC410224A9F5900BA7436 /* Constants.h */, - EE3EC412224A9F5900BA7436 /* main.cpp */, EE3EC40D224A9F5800BA7436 /* ObjectCache.cpp */, EE3EC3F9224A9F5500BA7436 /* ObjectCache.h */, - EE3EC41A224A9F5A00BA7436 /* PerfQuery.cpp */, - EE3EC401224A9F5700BA7436 /* PerfQuery.h */, - EE3EC3FF224A9F5600BA7436 /* Renderer.cpp */, - EE3EC3FB224A9F5600BA7436 /* Renderer.h */, EE3EC40C224A9F5800BA7436 /* ShaderCompiler.cpp */, EE3EC40B224A9F5800BA7436 /* ShaderCompiler.h */, EE3EC3F8224A9F5500BA7436 /* StagingBuffer.cpp */, EE3EC407224A9F5700BA7436 /* StagingBuffer.h */, EE3EC413224A9F5900BA7436 /* StateTracker.cpp */, EE3EC3FD224A9F5600BA7436 /* StateTracker.h */, - EE3EC418224A9F5A00BA7436 /* StreamBuffer.cpp */, - EE3EC41B224A9F5B00BA7436 /* StreamBuffer.h */, - EE3EC419224A9F5A00BA7436 /* SwapChain.cpp */, - EE3EC3FA224A9F5500BA7436 /* SwapChain.h */, - EE3EC404224A9F5700BA7436 /* VertexFormat.cpp */, - EE3EC40A224A9F5800BA7436 /* VertexFormat.h */, - EE3EC3FC224A9F5600BA7436 /* VertexManager.cpp */, - EE3EC402224A9F5700BA7436 /* VertexManager.h */, EE3EC414224A9F5A00BA7436 /* VideoBackend.h */, + EE3EC417224A9F5A00BA7436 /* VKBoundingBox.cpp */, + EE3EC3F7224A9F5500BA7436 /* VKBoundingBox.h */, + EE3EC412224A9F5900BA7436 /* VKMain.cpp */, + EE3EC41A224A9F5A00BA7436 /* VKPerfQuery.cpp */, + EE3EC401224A9F5700BA7436 /* VKPerfQuery.h */, EE3EC400224A9F5600BA7436 /* VKPipeline.cpp */, EE3EC40E224A9F5900BA7436 /* VKPipeline.h */, + EE3EC3FF224A9F5600BA7436 /* VKRenderer.cpp */, + EE3EC3FB224A9F5600BA7436 /* VKRenderer.h */, EE3EC403224A9F5700BA7436 /* VKShader.cpp */, EE3EC3FE224A9F5600BA7436 /* VKShader.h */, + EE3EC418224A9F5A00BA7436 /* VKStreamBuffer.cpp */, + EE3EC41B224A9F5B00BA7436 /* VKStreamBuffer.h */, + EE3EC419224A9F5A00BA7436 /* VKSwapChain.cpp */, + EE3EC3FA224A9F5500BA7436 /* VKSwapChain.h */, EE3EC406224A9F5700BA7436 /* VKTexture.cpp */, EE3EC405224A9F5700BA7436 /* VKTexture.h */, + EE3EC404224A9F5700BA7436 /* VKVertexFormat.cpp */, + EE3EC40A224A9F5800BA7436 /* VKVertexFormat.h */, + EE3EC3FC224A9F5600BA7436 /* VKVertexManager.cpp */, + EE3EC402224A9F5700BA7436 /* VKVertexManager.h */, EE3EC411224A9F5900BA7436 /* VulkanContext.cpp */, EE3EC408224A9F5800BA7436 /* VulkanContext.h */, EE3EC409224A9F5800BA7436 /* VulkanEntryPoints.inl */, @@ -7214,18 +7198,19 @@ EE8DD25D22492A9F005E1AF5 /* imgui */ = { isa = PBXGroup; children = ( - EE8DD25E22492A9F005E1AF5 /* imgui.h */, - EE8DD25F22492A9F005E1AF5 /* imstb_textedit.h */, - EE8DD26022492A9F005E1AF5 /* imconfig.h */, - EE8DD26122492A9F005E1AF5 /* imgui_widgets.cpp */, EE8DD26222492A9F005E1AF5 /* CMakeLists.txt */, - EE8DD26322492A9F005E1AF5 /* imstb_truetype.h */, - EE8DD26422492A9F005E1AF5 /* imgui.cpp */, + EE8DD26022492A9F005E1AF5 /* imconfig.h */, + EE8DD26922492A9F005E1AF5 /* imgui_draw.cpp */, EE8DD26522492A9F005E1AF5 /* imgui_internal.h */, + 5550902627FA989A00CA618C /* imgui_tables.cpp */, + EE8DD26122492A9F005E1AF5 /* imgui_widgets.cpp */, + EE8DD26422492A9F005E1AF5 /* imgui.cpp */, + EE8DD25E22492A9F005E1AF5 /* imgui.h */, EE8DD26622492A9F005E1AF5 /* imgui.vcxproj */, EE8DD26722492A9F005E1AF5 /* imstb_rectpack.h */, + EE8DD25F22492A9F005E1AF5 /* imstb_textedit.h */, + EE8DD26322492A9F005E1AF5 /* imstb_truetype.h */, EE8DD26822492A9F005E1AF5 /* LICENSE.txt */, - EE8DD26922492A9F005E1AF5 /* imgui_draw.cpp */, ); path = imgui; sourceTree = ""; @@ -7719,8 +7704,8 @@ EE98C04B24B92AD900FFFDD7 /* Wiimote */ = { isa = PBXGroup; children = ( - EE98C04C24B92AD900FFFDD7 /* Wiimote.h */, - EE98C04D24B92AD900FFFDD7 /* Wiimote.cpp */, + 5550908B27FAA66900CA618C /* WiimoteController.cpp */, + EE98C04C24B92AD900FFFDD7 /* WiimoteController.h */, ); path = Wiimote; sourceTree = ""; @@ -7742,6 +7727,7 @@ children = ( EEE07D4222C43C52006D46FD /* ConfigManager.cpp */, EE9E292B23BCF8DB00EFD1A8 /* GraphicsSettings.cpp */, + 55508FF427FA818E00CA618C /* JitARCH.cpp */, ); path = Core; sourceTree = ""; @@ -8141,18 +8127,6 @@ buildRules = ( ); dependencies = ( - 3EFF28EC1F85606C00B4FD11 /* PBXTargetDependency */, - 3EFF28EE1F85606C00B4FD11 /* PBXTargetDependency */, - 3EFF28F01F85606C00B4FD11 /* PBXTargetDependency */, - 3EFF28F41F85606C00B4FD11 /* PBXTargetDependency */, - 3EFF28F61F85606C00B4FD11 /* PBXTargetDependency */, - 3EFF28F81F85606C00B4FD11 /* PBXTargetDependency */, - 3EFF28FA1F85606C00B4FD11 /* PBXTargetDependency */, - 3EFF28FC1F85606C00B4FD11 /* PBXTargetDependency */, - 3EFF28FE1F85606C00B4FD11 /* PBXTargetDependency */, - 3EFF29001F85606C00B4FD11 /* PBXTargetDependency */, - 3EFF29021F85606C00B4FD11 /* PBXTargetDependency */, - 3EFF29041F85606C00B4FD11 /* PBXTargetDependency */, ); name = videonull; productName = videosoftware; @@ -8169,20 +8143,6 @@ buildRules = ( ); dependencies = ( - EEE07D3B22C272CE006D46FD /* PBXTargetDependency */, - EE3A465E22B687FA00031B56 /* PBXTargetDependency */, - EE47577B224AB4D20027BA05 /* PBXTargetDependency */, - 3EFF295E1F85D07E00B4FD11 /* PBXTargetDependency */, - 3EFF28BC1F855D2600B4FD11 /* PBXTargetDependency */, - 3EFF29471F8567DA00B4FD11 /* PBXTargetDependency */, - 3EFF28C41F855DF200B4FD11 /* PBXTargetDependency */, - 3EFF28C61F855DF200B4FD11 /* PBXTargetDependency */, - 3EFF29211F8560DC00B4FD11 /* PBXTargetDependency */, - 3EFF293D1F85630E00B4FD11 /* PBXTargetDependency */, - 3EFF293A1F8562C700B4FD11 /* PBXTargetDependency */, - 3EFF28A41F855BD100B4FD11 /* PBXTargetDependency */, - 3EFF288F1F8559A100B4FD11 /* PBXTargetDependency */, - 3EFF28911F8559A100B4FD11 /* PBXTargetDependency */, ); name = core; productName = core; @@ -8199,15 +8159,6 @@ buildRules = ( ); dependencies = ( - EE98BE9724B8F68D00FFFDD7 /* PBXTargetDependency */, - 3EFF28B21F855CE900B4FD11 /* PBXTargetDependency */, - 3EFF28B01F855CE900B4FD11 /* PBXTargetDependency */, - 3EFF28B61F855CE900B4FD11 /* PBXTargetDependency */, - 3EFF289B1F855B7700B4FD11 /* PBXTargetDependency */, - 3EFF28951F8559F300B4FD11 /* PBXTargetDependency */, - 3EFF28881F85580B00B4FD11 /* PBXTargetDependency */, - 3E8D27CF1D21DA830086BA59 /* PBXTargetDependency */, - D4FBA138615947188B0D1C32 /* PBXTargetDependency */, ); name = common; productName = common; @@ -8224,8 +8175,6 @@ buildRules = ( ); dependencies = ( - 3EFF28801F85528100B4FD11 /* PBXTargetDependency */, - 3EFF25971F84441100B4FD11 /* PBXTargetDependency */, C5EA110424434DD48D47E772 /* PBXTargetDependency */, ); name = inputcommon; @@ -8259,7 +8208,41 @@ buildRules = ( ); dependencies = ( + 5550902C27FA9E6A00CA618C /* PBXTargetDependency */, + 5550902E27FA9E6A00CA618C /* PBXTargetDependency */, + 5550903027FA9E6A00CA618C /* PBXTargetDependency */, + 5550903227FA9E6A00CA618C /* PBXTargetDependency */, + 5550903427FA9E6A00CA618C /* PBXTargetDependency */, + 5550903627FA9E6A00CA618C /* PBXTargetDependency */, + 5550903827FA9E6A00CA618C /* PBXTargetDependency */, + 5550903A27FA9E6A00CA618C /* PBXTargetDependency */, 8355D4B71A65392600E73302 /* PBXTargetDependency */, + 5550903C27FA9E6A00CA618C /* PBXTargetDependency */, + 5550903E27FA9E6A00CA618C /* PBXTargetDependency */, + 5550904027FA9E6A00CA618C /* PBXTargetDependency */, + 5550904227FA9E6A00CA618C /* PBXTargetDependency */, + 5550904427FA9E6A00CA618C /* PBXTargetDependency */, + 5550904627FA9E6A00CA618C /* PBXTargetDependency */, + 5550904827FA9E6A00CA618C /* PBXTargetDependency */, + 5550904A27FA9E6A00CA618C /* PBXTargetDependency */, + 5550904C27FA9E6A00CA618C /* PBXTargetDependency */, + 5550904E27FA9E6A00CA618C /* PBXTargetDependency */, + 5550905027FA9E6A00CA618C /* PBXTargetDependency */, + 5550905227FA9E6A00CA618C /* PBXTargetDependency */, + 5550905427FA9E6A00CA618C /* PBXTargetDependency */, + 5550905627FA9E6A00CA618C /* PBXTargetDependency */, + 5550905827FA9E6A00CA618C /* PBXTargetDependency */, + 5550905A27FA9E6A00CA618C /* PBXTargetDependency */, + 5550905C27FA9E6A00CA618C /* PBXTargetDependency */, + 5550905E27FA9E6A00CA618C /* PBXTargetDependency */, + 5550906027FA9E6A00CA618C /* PBXTargetDependency */, + 5550906227FA9E6A00CA618C /* PBXTargetDependency */, + 5550906427FA9E6A00CA618C /* PBXTargetDependency */, + 5550906627FA9E6A00CA618C /* PBXTargetDependency */, + 5550906827FA9E6A00CA618C /* PBXTargetDependency */, + 5550906A27FA9E6A00CA618C /* PBXTargetDependency */, + 5550906C27FA9E6A00CA618C /* PBXTargetDependency */, + 5550906E27FA9E6A00CA618C /* PBXTargetDependency */, ); name = dolphin; productName = "Dolphin-Core"; @@ -8368,7 +8351,6 @@ buildRules = ( ); dependencies = ( - A88BDD87229C4AB5B4903635 /* PBXTargetDependency */, ); name = videoogl; productName = videoogl; @@ -8431,8 +8413,6 @@ buildRules = ( ); dependencies = ( - 0AFA40AA076E45D1ACD9958B /* PBXTargetDependency */, - 93498BA6ECB9420391134E30 /* PBXTargetDependency */, ); name = videosoftware; productName = videosoftware; @@ -8466,10 +8446,6 @@ buildRules = ( ); dependencies = ( - EE47577D224AB5E60027BA05 /* PBXTargetDependency */, - EEF4EF0C224AAFFE0077748D /* PBXTargetDependency */, - EECD3720224AAAD5000AE115 /* PBXTargetDependency */, - EE3EC41E224AA01500BA7436 /* PBXTargetDependency */, ); name = videovulkan; productName = videoogl; @@ -8595,7 +8571,6 @@ ); dependencies = ( EEC94A65224AC08500F85ABA /* PBXTargetDependency */, - EE475775224AB34C0027BA05 /* PBXTargetDependency */, ); name = glslang; productName = videoogl; @@ -8627,11 +8602,6 @@ buildRules = ( ); dependencies = ( - EE8DD2C3224A7D86005E1AF5 /* PBXTargetDependency */, - 3EFF28981F855A1D00B4FD11 /* PBXTargetDependency */, - 8378DED01A786335003DA046 /* PBXTargetDependency */, - AE8B9146B6514DB4986FDB1F /* PBXTargetDependency */, - EE3EC449224AA0A800BA7436 /* PBXTargetDependency */, ); name = videocommon; productName = videocommon; @@ -8648,10 +8618,6 @@ buildRules = ( ); dependencies = ( - EE8DD2EC224A7F73005E1AF5 /* PBXTargetDependency */, - 3EFF27941F84622700B4FD11 /* PBXTargetDependency */, - 55F803F7B2124798AFEEB3B3 /* PBXTargetDependency */, - 34377890D64F4D2EB998EAA4 /* PBXTargetDependency */, ); name = audiocommon; productName = audiocommon; @@ -8871,25 +8837,25 @@ 3EFF26411F845CA500B4FD11 /* SYSCONFSettings.cpp in Sources */, EE8DD29322493134005E1AF5 /* Camera.cpp in Sources */, 3E8EC6B71F8436F100D79F27 /* DSPIntMultiplier.cpp in Sources */, - 3E3D74091C82B0F900091C4D /* Jit_SystemRegisters.cpp in Sources */, 3E3D73961C82B0F900091C4D /* MailHandler.cpp in Sources */, 3E3D73CB1C82B0F900091C4D /* VideoInterface.cpp in Sources */, 3E3D73671C82B0F900091C4D /* DSPCodeUtil.cpp in Sources */, 3E3D73A41C82B0F900091C4D /* DSPSymbols.cpp in Sources */, 3E3D73651C82B0F900091C4D /* DSPAssembler.cpp in Sources */, - 3E8EC6D21F84376E00D79F27 /* ConstantPool.cpp in Sources */, EE6ABE9E239C7858005E5F7D /* Socket.cpp in Sources */, + 5550908927FAA35E00CA618C /* NetPlayCommon.cpp in Sources */, 3E3D73FA1C82B0F900091C4D /* Interpreter_Integer.cpp in Sources */, 3E3D736B1C82B0F900091C4D /* DSPHWInterface.cpp in Sources */, + 55508FF527FA818E00CA618C /* JitARCH.cpp in Sources */, EE149BA5205A270F008D5DDE /* DSPJitExtOps.cpp in Sources */, EE6ABE8E239C782A005E5F7D /* DeviceStub.cpp in Sources */, EE45F44022B553BF00C5D0C0 /* GCIFile.cpp in Sources */, 3E8EC6BD1F8436F100D79F27 /* DSPIntBranch.cpp in Sources */, + 5550902527FA914000CA618C /* FileSystemCommon.cpp in Sources */, 3EFF26471F845CA500B4FD11 /* GameConfigLoader.cpp in Sources */, EE6ABE92239C783B005E5F7D /* DI.cpp in Sources */, 3E3D73C81C82B0F900091C4D /* Sram.cpp in Sources */, EE98C05324B92D0200FFFDD7 /* XLINK_KAI_BBA.cpp in Sources */, - 3E8D25FA1D21D8F70086BA59 /* Analytics.cpp in Sources */, 3EFF27111F8460BC00B4FD11 /* TitleDatabase.cpp in Sources */, EE6ABED5239C78D1005E5F7D /* USB_KBD.cpp in Sources */, 3E3D738E1C82B0F900091C4D /* HotkeyManager.cpp in Sources */, @@ -8900,10 +8866,9 @@ EE149BA4205A270F008D5DDE /* DSPJitLoadStore.cpp in Sources */, 3E8EC6661F8434AA00D79F27 /* GCMemcardRaw.cpp in Sources */, EE8DD29222493134005E1AF5 /* ExtensionPort.cpp in Sources */, - 3E3D740C1C82B0F900091C4D /* Jit64AsmCommon.cpp in Sources */, - EE6ABEAA239C787E005E5F7D /* FileSystem.cpp in Sources */, EE6ABEB4239C789E005E5F7D /* SDIOSlot0.cpp in Sources */, EE8DD29422493134005E1AF5 /* I2CBus.cpp in Sources */, + 55508FF827FA888B00CA618C /* WiimoteSettings.cpp in Sources */, EE45F43D22B5532100C5D0C0 /* AddressSpace.cpp in Sources */, 3E8EC6651F8434AA00D79F27 /* GCMemcard.cpp in Sources */, EE6ABF0E239C7A59005E5F7D /* BTEmu.cpp in Sources */, @@ -8919,11 +8884,11 @@ EE149BA6205A270F008D5DDE /* DSPJitBranch.cpp in Sources */, 3E8EC66E1F8434AA00D79F27 /* EXI.cpp in Sources */, EE6ABEC2239C78AE005E5F7D /* TitleManagement.cpp in Sources */, + 5550908027FAA05900CA618C /* GraphicsSettings.cpp in Sources */, 3E3D73CD1C82B0F900091C4D /* Wiimote.cpp in Sources */, - 3E3D74061C82B0F900091C4D /* Jit_LoadStoreFloating.cpp in Sources */, - 3E8EC6D11F84376E00D79F27 /* FarCodeCache.cpp in Sources */, 3E3D73891C82B0F900091C4D /* GeckoCode.cpp in Sources */, 3E3D73691C82B0F900091C4D /* DSPDisassembler.cpp in Sources */, + 5550907D27FA9FED00CA618C /* GBAPad.cpp in Sources */, 3E3D73661C82B0F900091C4D /* DSPCaptureLogger.cpp in Sources */, EEF97BEC25A77079008C4BB2 /* FreeLookConfig.cpp in Sources */, 3E3D73981C82B0F900091C4D /* AXWii.cpp in Sources */, @@ -8932,7 +8897,6 @@ 3E3D74201C82B0F900091C4D /* JitAsmCommon.cpp in Sources */, 3E3D73741C82B0F900091C4D /* DSPMemoryMap.cpp in Sources */, EE6ABEA5239C7874005E5F7D /* FS.cpp in Sources */, - 3E8EC6D31F84376E00D79F27 /* EmuCodeBlock.cpp in Sources */, EE6ABEF9239C7A35005E5F7D /* HIDv4.cpp in Sources */, EE3A463A22B5F23C00031B56 /* DrawsomeTablet.cpp in Sources */, 3E3D73F91C82B0F900091C4D /* Interpreter_FloatingPoint.cpp in Sources */, @@ -8940,11 +8904,11 @@ 3E8EC65D1F8434AA00D79F27 /* SI_DeviceGCAdapter.cpp in Sources */, 3EFF27001F845E9F00B4FD11 /* DSYSignatureDB.cpp in Sources */, 3E8EC6E71F8437D000D79F27 /* RSO.cpp in Sources */, + 55508FFD27FA8AAC00CA618C /* DefaultLocale.cpp in Sources */, EE149BAB205A270F008D5DDE /* DSPJitUtil.cpp in Sources */, 3E3D73EF1C82B0F900091C4D /* MemoryWatcher.cpp in Sources */, EE6ABEF3239C7A0B005E5F7D /* Top.cpp in Sources */, 3E3D73801C82B0F900091C4D /* LabelMap.cpp in Sources */, - 3E3D74081C82B0F900091C4D /* Jit_Paired.cpp in Sources */, 3E3D73F21C82B0F900091C4D /* NetPlayClient.cpp in Sources */, 3E8EC6721F8434AA00D79F27 /* EXI_DeviceIPL.cpp in Sources */, 3EFF26491F845CA500B4FD11 /* IsSettingSaveable.cpp in Sources */, @@ -8953,8 +8917,6 @@ 3E3D739A1C82B0F900091C4D /* GBA.cpp in Sources */, EE6ABEC3239C78AE005E5F7D /* ES.cpp in Sources */, 3E8EC6E41F8437BC00D79F27 /* DolReader.cpp in Sources */, - 3E3D74051C82B0F900091C4D /* Jit_LoadStore.cpp in Sources */, - 3E8EC6D51F84376E00D79F27 /* BlockCache.cpp in Sources */, 3E3D73861C82B0F900091C4D /* FifoPlayer.cpp in Sources */, 3E3D73B31C82B0F900091C4D /* GCKeyboardEmu.cpp in Sources */, 3E3D73F41C82B0F900091C4D /* PatchEngine.cpp in Sources */, @@ -8973,7 +8935,6 @@ 3E8EC6A91F8434C700D79F27 /* Encryption.cpp in Sources */, 3EFF26421F845CA500B4FD11 /* NetplaySettings.cpp in Sources */, 3E8EC66C1F8434AA00D79F27 /* EXI_Channel.cpp in Sources */, - 3E3D74011C82B0F900091C4D /* Jit64_Tables.cpp in Sources */, 3E3D73F81C82B0F900091C4D /* Interpreter_Branch.cpp in Sources */, 3E3D74221C82B0F900091C4D /* JitBase.cpp in Sources */, 3E3D74231C82B0F900091C4D /* JitCache.cpp in Sources */, @@ -8981,7 +8942,8 @@ EE6ABEED239C79E6005E5F7D /* NetKDTime.cpp in Sources */, 3EFF27131F8460BC00B4FD11 /* WiiUtils.cpp in Sources */, EE6ABEBF239C78AE005E5F7D /* Formats.cpp in Sources */, - 3E3D74001C82B0F900091C4D /* Jit.cpp in Sources */, + 5550900427FA8B4800CA618C /* NetworkCaptureLogger.cpp in Sources */, + 5550907F27FA9FED00CA618C /* GBAPadEmu.cpp in Sources */, EEF97C1D25A77416008C4BB2 /* OSThread.cpp in Sources */, 3EFF26FD1F845E9F00B4FD11 /* CachedInterpreter.cpp in Sources */, 3E3D735B1C82B0F900091C4D /* ElfReader.cpp in Sources */, @@ -9000,6 +8962,7 @@ 3E8EC6A11F8434C700D79F27 /* Speaker.cpp in Sources */, EE8DD2B3224A79E3005E1AF5 /* DataReport.cpp in Sources */, 3E8EC6751F8434AA00D79F27 /* EXI_DeviceDummy.cpp in Sources */, + 5550908A27FAA49A00CA618C /* GDBStub.cpp in Sources */, EE6ABED8239C78D1005E5F7D /* USBV4.cpp in Sources */, EE6ABEAB239C787E005E5F7D /* FileSystemProxy.cpp in Sources */, 3E3D73761C82B0F900091C4D /* DSPTables.cpp in Sources */, @@ -9010,7 +8973,6 @@ EE6ABEA4239C7874005E5F7D /* File.cpp in Sources */, EEF8A0F320B3524E008678D3 /* (null) in Sources */, 3EFF26FF1F845E9F00B4FD11 /* SignatureDB.cpp in Sources */, - 3E3D740A1C82B0F900091C4D /* JitAsm.cpp in Sources */, 3E3D73CA1C82B0F900091C4D /* SystemTimers.cpp in Sources */, 3E3D74331C82B0F900091C4D /* PPCSymbolDB.cpp in Sources */, 3E3D735F1C82B0F900091C4D /* CoreTiming.cpp in Sources */, @@ -9021,7 +8983,6 @@ EE149BAC205A270F008D5DDE /* DSPJitRegCache.cpp in Sources */, EE6ABF11239C7A59005E5F7D /* WiimoteDevice.cpp in Sources */, EEF8A0F020B34DA8008678D3 /* (null) in Sources */, - 3E3D74021C82B0F900091C4D /* Jit_Branch.cpp in Sources */, 3E3D73C91C82B0F900091C4D /* StreamADPCM.cpp in Sources */, 3E3D735C1C82B0F900091C4D /* BootManager.cpp in Sources */, EEF97BEE25A77079008C4BB2 /* System.cpp in Sources */, @@ -9036,7 +8997,6 @@ 3E3D738F1C82B0F900091C4D /* AudioInterface.cpp in Sources */, EE6ABED6239C78D1005E5F7D /* Common.cpp in Sources */, EE2CDFCE22565FFC00318BE7 /* Nunchuk.cpp in Sources */, - 3E3D73851C82B0F900091C4D /* FifoPlaybackAnalyzer.cpp in Sources */, EE6ABEE4239C79D5005E5F7D /* WiiNetConfig.cpp in Sources */, 3E8EC6BB1F8436F100D79F27 /* DSPIntLoadStore.cpp in Sources */, 3E3D73FB1C82B0F900091C4D /* Interpreter_LoadStore.cpp in Sources */, @@ -9077,7 +9037,7 @@ 3E3D73601C82B0F900091C4D /* Debugger_SymbolMap.cpp in Sources */, 3E8EC6731F8434AA00D79F27 /* EXI_DeviceMemoryCard.cpp in Sources */, 3E3D73FF1C82B0F900091C4D /* Interpreter_Tables.cpp in Sources */, - 3E3D74041C82B0F900091C4D /* Jit_Integer.cpp in Sources */, + 5550900127FA8AF400CA618C /* DolphinAnalytics.cpp in Sources */, 3E8EC6581F8434AA00D79F27 /* DVDInterface.cpp in Sources */, 3E3D738D1C82B0F900091C4D /* HLE_OS.cpp in Sources */, EE6ABE8C239C782A005E5F7D /* VersionInfo.cpp in Sources */, @@ -9090,23 +9050,19 @@ 3E3D74301C82B0F900091C4D /* PowerPC.cpp in Sources */, 3E8EC6631F8434AA00D79F27 /* SI_DeviceKeyboard.cpp in Sources */, EE6ABEB0239C7890005E5F7D /* WFSSRV.cpp in Sources */, + 5550908327FAA0D100CA618C /* DivUtils.cpp in Sources */, 3E3D73541C82B0F900091C4D /* ActionReplay.cpp in Sources */, - 3EFF25221F84432A00B4FD11 /* IOdarwin.mm in Sources */, - 3E8EC6D01F84376E00D79F27 /* TrampolineCache.cpp in Sources */, 3E3D735A1C82B0F900091C4D /* Boot_WiiWAD.cpp in Sources */, EE6ABEC1239C78AE005E5F7D /* TitleInformation.cpp in Sources */, 3E8EC6681F8434AA00D79F27 /* EXI_Device.cpp in Sources */, EE6ABE9C239C7858005E5F7D /* MACUtils.cpp in Sources */, EE6ABE8F239C782A005E5F7D /* Device.cpp in Sources */, - 3E3D73831C82B0F900091C4D /* FifoAnalyzer.cpp in Sources */, 3E8EC6671F8434AA00D79F27 /* GCMemcardDirectory.cpp in Sources */, EE6ABF12239C7A59005E5F7D /* WiimoteHIDAttr.cpp in Sources */, EE149BA8205A270F008D5DDE /* DSPJitMultiplier.cpp in Sources */, 3E3D73751C82B0F900091C4D /* DSPStacks.cpp in Sources */, EEF8A0F220B35191008678D3 /* (null) in Sources */, - 3E3D73871C82B0F900091C4D /* FifoRecordAnalyzer.cpp in Sources */, 3E3D73B91C82B0F900091C4D /* GPFifo.cpp in Sources */, - 3E3D74071C82B0F900091C4D /* Jit_LoadStorePaired.cpp in Sources */, 3E8EC6601F8434AA00D79F27 /* SI.cpp in Sources */, 3E3D73FE1C82B0F900091C4D /* Interpreter_SystemRegisters.cpp in Sources */, EE6ABEB1239C7890005E5F7D /* WFSI.cpp in Sources */, @@ -9118,6 +9074,7 @@ EE6ABEEB239C79E6005E5F7D /* NWC24Config.cpp in Sources */, 3E8EC6591F8434AA00D79F27 /* FileMonitor.cpp in Sources */, EE6ABEFF239C7A48005E5F7D /* OH0Device.cpp in Sources */, + 55508FFE27FA8AAC00CA618C /* SessionSettings.cpp in Sources */, EE1FAE9120AD027000748BE0 /* WiiSave.cpp in Sources */, EE8DD29C22493134005E1AF5 /* Dynamics.cpp in Sources */, 3E8EC6BC1F8436F100D79F27 /* DSPIntMisc.cpp in Sources */, @@ -9125,9 +9082,7 @@ 3E8EC66B1F8434AA00D79F27 /* EXI_DeviceMic.cpp in Sources */, EE6ABF16239C7A6D005E5F7D /* VEN.cpp in Sources */, EE6ABED9239C78D1005E5F7D /* USBV0.cpp in Sources */, - 3E3D74031C82B0F900091C4D /* Jit_FloatingPoint.cpp in Sources */, 3EFF25231F84432A00B4FD11 /* WiimoteReal.cpp in Sources */, - 3E3D73A21C82B0F900091C4D /* DSPLLEGlobals.cpp in Sources */, 3E8EC65F1F8434AA00D79F27 /* SI_DeviceNull.cpp in Sources */, EE6ABF10239C7A59005E5F7D /* BTStub.cpp in Sources */, 3E8EC65E1F8434AA00D79F27 /* SI_DeviceDanceMat.cpp in Sources */, @@ -9146,10 +9101,11 @@ 3E3D71771C82B0BB00091C4D /* JitRegister.cpp in Sources */, 3E3D71811C82B0BB00091C4D /* NandPaths.cpp in Sources */, 3E3D71801C82B0BB00091C4D /* MsgHandler.cpp in Sources */, - 3E3D717D1C82B0BB00091C4D /* MemArena.cpp in Sources */, + 3E3D717D1C82B0BB00091C4D /* MemArenaUnix.cpp in Sources */, 3E3D718D1C82B0BB00091C4D /* TraversalClient.cpp in Sources */, 3EFF260D1F84560100B4FD11 /* HttpRequest.cpp in Sources */, 3E3D71901C82B0BB00091C4D /* Version.cpp in Sources */, + 5550901A27FA8F5D00CA618C /* ImageC.c in Sources */, 55508FC827FA498600CA618C /* CPUDetect.cpp in Sources */, 3EFF260A1F84560100B4FD11 /* CommonFuncs.cpp in Sources */, EE3A462122B5DCBB00031B56 /* DynamicLibrary.cpp in Sources */, @@ -9162,6 +9118,7 @@ 3E3D71621C82B0BB00091C4D /* ColorUtil.cpp in Sources */, EE5F71A220B322F80083D8D8 /* Image.cpp in Sources */, 3E3D71821C82B0BB00091C4D /* Network.cpp in Sources */, + 55508FDB27FA749D00CA618C /* IOFile.cpp in Sources */, 3E3D71691C82B0BB00091C4D /* GenericCPUDetect.cpp in Sources */, 3E3D71911C82B0BB00091C4D /* x64ABI.cpp in Sources */, 3EFF26101F84560100B4FD11 /* UPnP.cpp in Sources */, @@ -9172,11 +9129,9 @@ 3E3D716B1C82B0BB00091C4D /* GLExtensions.cpp in Sources */, EE8DD25C2249286B005E1AF5 /* GLContext.cpp in Sources */, 3E3D71681C82B0BB00091C4D /* GekkoDisassembler.cpp in Sources */, - 3EFF260C1F84560100B4FD11 /* File.cpp in Sources */, 3E3D71661C82B0BB00091C4D /* FileSearch.cpp in Sources */, 3E3D71831C82B0BB00091C4D /* PcapFile.cpp in Sources */, EE5FDAD224F4438900DA2D43 /* Layer.cpp in Sources */, - 3EFF260F1F84560100B4FD11 /* MD5.cpp in Sources */, EEF6386C2069EDDF00F7FEA5 /* QoSSession.cpp in Sources */, 3E3D71861C82B0BB00091C4D /* SDCardUtil.cpp in Sources */, 3E3D718E1C82B0BB00091C4D /* TraversalServer.cpp in Sources */, @@ -9195,8 +9150,10 @@ 3E3D71741C82B0BB00091C4D /* GLUtil.cpp in Sources */, 3E3D71761C82B0BB00091C4D /* IniFile.cpp in Sources */, EE9C006C20A4F94000312609 /* Watches.cpp in Sources */, + 5550908627FAA30100CA618C /* SocketContext.cpp in Sources */, 3E3D71751C82B0BB00091C4D /* Hash.cpp in Sources */, 3E3D71871C82B0BB00091C4D /* SettingsHandler.cpp in Sources */, + 5550900527FA8B8500CA618C /* Arm64Emitter.cpp in Sources */, 3E3D71651C82B0BB00091C4D /* ENetUtil.cpp in Sources */, 3EFF28A81F855C3100B4FD11 /* AES.cpp in Sources */, ); @@ -9488,10 +9445,10 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 3EFF291F1F8560BA00B4FD11 /* VertexManager.cpp in Sources */, + 3EFF291F1F8560BA00B4FD11 /* NullVertexManager.cpp in Sources */, 3EFF291C1F8560BA00B4FD11 /* NullTexture.cpp in Sources */, 3EFF291B1F8560BA00B4FD11 /* NullBackend.cpp in Sources */, - 3EFF294F1F85830500B4FD11 /* Render.cpp in Sources */, + 3EFF294F1F85830500B4FD11 /* NullRender.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -9515,13 +9472,16 @@ EE98BE1E24B8F4A400FFFDD7 /* WIACompression.cpp in Sources */, 3E8EC5771F84235200D79F27 /* Enums.cpp in Sources */, 3E3D74631C82B11900091C4D /* DriveBlob.cpp in Sources */, + 5550901727FA8D9400CA618C /* RiivolutionParser.cpp in Sources */, 3E7AE8E81FB4E6900017E3D1 /* WiiSaveBanner.cpp in Sources */, 3E8EC5791F84235200D79F27 /* NANDImporter.cpp in Sources */, 3E8EC57E1F84235200D79F27 /* Volume.cpp in Sources */, EE98BE1A24B8F4A400FFFDD7 /* LaggedFibonacciGenerator.cpp in Sources */, + 5550901627FA8D9400CA618C /* RiivolutionPatcher.cpp in Sources */, 3E3D74621C82B11900091C4D /* DiscScrubber.cpp in Sources */, EE98BE1924B8F4A400FFFDD7 /* WiiEncryptionCache.cpp in Sources */, 3E3D74661C82B11900091C4D /* Filesystem.cpp in Sources */, + 5550902027FA903800CA618C /* DiscUtils.cpp in Sources */, 3E3D74601C82B11900091C4D /* CISOBlob.cpp in Sources */, 3E3D74611C82B11900091C4D /* CompressedBlob.cpp in Sources */, 3E3D74671C82B11900091C4D /* FileSystemGCWii.cpp in Sources */, @@ -9538,6 +9498,7 @@ 3E8EC5781F84235200D79F27 /* TGCBlob.cpp in Sources */, 3E3D746C1C82B11900091C4D /* VolumeGC.cpp in Sources */, EE45F43722B552A900C5D0C0 /* VolumeVerifier.cpp in Sources */, + 5550902327FA905400CA618C /* GameModDescriptor.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -9550,6 +9511,7 @@ EE6ABE43239C36AD005E5F7D /* ModifySettingsButton.cpp in Sources */, EE79F8DD25A768BE00EE9AAC /* ImageOperations.cpp in Sources */, EE6ABE3E239C36AD005E5F7D /* Triggers.cpp in Sources */, + 5550907527FA9F8500CA618C /* DITConfiguration.cpp in Sources */, EE6ABE48239C36AD005E5F7D /* Tilt.cpp in Sources */, EEE07D4122C43C40006D46FD /* InputConfig.cpp in Sources */, EE6ABE50239C36C4005E5F7D /* ControllerEmu.cpp in Sources */, @@ -9558,7 +9520,6 @@ EE6ABE62239C3738005E5F7D /* ForceFeedbackDevice.cpp in Sources */, EE6ABE1B239C3679005E5F7D /* Control.cpp in Sources */, EE6ABE6D239C3766005E5F7D /* OSX.mm in Sources */, - EE98C04E24B92ADA00FFFDD7 /* Wiimote.cpp in Sources */, EE6ABE6E239C3766005E5F7D /* OSXJoystick.mm in Sources */, EE6ABE49239C36AD005E5F7D /* IMUAccelerometer.cpp in Sources */, 3EFF25CC1F8444D200B4FD11 /* GCAdapter.cpp in Sources */, @@ -9569,15 +9530,16 @@ EE4EFB39239ED6F50085CA75 /* OpenEmuInput.cpp in Sources */, EE6ABE46239C36AD005E5F7D /* IMUGyroscope.cpp in Sources */, EE6ABE47239C36AD005E5F7D /* Cursor.cpp in Sources */, - EE79F8DE25A768BE00EE9AAC /* DynamicInputTextureConfiguration.cpp in Sources */, EE6ABE20239C368C005E5F7D /* NumericSetting.cpp in Sources */, EE6ABE3F239C36AD005E5F7D /* IMUCursor.cpp in Sources */, EE79F8DC25A768BE00EE9AAC /* DynamicInputTextureManager.cpp in Sources */, EE6ABE57239C36D7005E5F7D /* ControlReference.cpp in Sources */, EE6ABE67239C3756005E5F7D /* Pipes.cpp in Sources */, + 5550908C27FAA66900CA618C /* WiimoteController.cpp in Sources */, EE682057210538C3008D5405 /* InputProfile.cpp in Sources */, EE6ABE74239C3774005E5F7D /* QuartzKeyboardAndMouse.mm in Sources */, - EE6ABE5F239C3724005E5F7D /* Device.cpp in Sources */, + 5550907627FA9F8500CA618C /* DITSpecification.cpp in Sources */, + EE6ABE5F239C3724005E5F7D /* CoreDevice.cpp in Sources */, EEE07D4022C43C40006D46FD /* ControllerInterface.cpp in Sources */, EE6ABE1D239C3679005E5F7D /* Output.cpp in Sources */, EE6ABE58239C36D7005E5F7D /* ExpressionParser.cpp in Sources */, @@ -9677,6 +9639,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 5550902A27FA98F700CA618C /* TextureInfo.cpp in Sources */, 3E0A56EE1FAF7EDC00D755B8 /* VideoConfig.cpp in Sources */, 3E3D75EF1C82B2DE00091C4D /* BPMemory.cpp in Sources */, 3E3D76051C82B2DE00091C4D /* RenderBase.cpp in Sources */, @@ -9721,6 +9684,7 @@ EE149B952059E192008D5DDE /* ShaderCache.cpp in Sources */, 55508FC627FA466100CA618C /* TextureDecoderARCH.cpp in Sources */, EE98BE0B24B8F43900FFFDD7 /* FreeLookCamera.cpp in Sources */, + 5550901127FA8CD800CA618C /* TMEM.cpp in Sources */, 3E3D75F01C82B2DE00091C4D /* BPStructs.cpp in Sources */, 3E3D75F61C82B2DE00091C4D /* FPSCounter.cpp in Sources */, EE8DD27922492B88005E1AF5 /* FramebufferShaderGen.cpp in Sources */, @@ -9748,6 +9712,7 @@ buildActionMask = 2147483647; files = ( 3E3D74F51C82B1D400091C4D /* pngrio.c in Sources */, + 5550900C27FA8C6600CA618C /* filter_neon_intrinsics.c in Sources */, 3E3D74E91C82B1D400091C4D /* pngerror.c in Sources */, 3E3D74FB1C82B1D400091C4D /* pngset.c in Sources */, 3E3D74E71C82B1D400091C4D /* png.c in Sources */, @@ -9759,8 +9724,10 @@ 3E3D74FF1C82B1D400091C4D /* pngtrans.c in Sources */, 3E3D75031C82B1D400091C4D /* pngwio.c in Sources */, 3E3D74F11C82B1D400091C4D /* pngpread.c in Sources */, + 5550900D27FA8C6600CA618C /* arm_init.c in Sources */, 3E3D75051C82B1D400091C4D /* pngwrite.c in Sources */, 3E3D74F91C82B1D400091C4D /* pngrutil.c in Sources */, + 5550900E27FA8C6600CA618C /* palette_neon_intrinsics.c in Sources */, 3E3D74F31C82B1D400091C4D /* pngread.c in Sources */, 3E3D74FD1C82B1D400091C4D /* pngtest.c in Sources */, ); @@ -9781,6 +9748,7 @@ 3E3D76681C82B33700091C4D /* EfbCopy.cpp in Sources */, 3E3D76671C82B33700091C4D /* DebugUtil.cpp in Sources */, 3E3D76691C82B33700091C4D /* EfbInterface.cpp in Sources */, + 5550901D27FA8FBA00CA618C /* SWBoundingBox.cpp in Sources */, 3E3D76731C82B33700091C4D /* TransformUnit.cpp in Sources */, 3E3D766F1C82B33700091C4D /* SWVertexLoader.cpp in Sources */, 3E3D76701C82B33700091C4D /* Tev.cpp in Sources */, @@ -9850,24 +9818,24 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - EE45F43222B43AC100C5D0C0 /* BoundingBox.cpp in Sources */, + EE45F43222B43AC100C5D0C0 /* VKBoundingBox.cpp in Sources */, EE45F41D22B4389200C5D0C0 /* VKTexture.cpp in Sources */, - EE45F41322B4389200C5D0C0 /* Renderer.cpp in Sources */, - EE45F41722B4389200C5D0C0 /* StreamBuffer.cpp in Sources */, - EE45F41822B4389200C5D0C0 /* SwapChain.cpp in Sources */, + EE45F41322B4389200C5D0C0 /* VKRenderer.cpp in Sources */, + EE45F41722B4389200C5D0C0 /* VKStreamBuffer.cpp in Sources */, + EE45F41822B4389200C5D0C0 /* VKSwapChain.cpp in Sources */, EE45F41522B4389200C5D0C0 /* StagingBuffer.cpp in Sources */, - EE45F41922B4389200C5D0C0 /* VertexFormat.cpp in Sources */, + EE45F41922B4389200C5D0C0 /* VKVertexFormat.cpp in Sources */, EE45F41C22B4389200C5D0C0 /* VKShader.cpp in Sources */, EE45F41B22B4389200C5D0C0 /* VKPipeline.cpp in Sources */, EE45F41E22B4389200C5D0C0 /* VulkanContext.cpp in Sources */, EE45F40F22B4389200C5D0C0 /* CommandBufferManager.cpp in Sources */, EE45F41F22B4389200C5D0C0 /* VulkanLoader.cpp in Sources */, - EE45F41222B4389200C5D0C0 /* PerfQuery.cpp in Sources */, - EE45F41022B4389200C5D0C0 /* main.cpp in Sources */, + EE45F41222B4389200C5D0C0 /* VKPerfQuery.cpp in Sources */, + EE45F41022B4389200C5D0C0 /* VKMain.cpp in Sources */, EE45F41422B4389200C5D0C0 /* ShaderCompiler.cpp in Sources */, EE45F41122B4389200C5D0C0 /* ObjectCache.cpp in Sources */, EE45F41622B4389200C5D0C0 /* StateTracker.cpp in Sources */, - EE45F41A22B4389200C5D0C0 /* VertexManager.cpp in Sources */, + EE45F41A22B4389200C5D0C0 /* VKVertexManager.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -9892,18 +9860,18 @@ buildActionMask = 2147483647; files = ( 3EFF27621F84617A00B4FD11 /* pugixml.cpp in Sources */, - 3E3D76391C82B30A00091C4D /* BoundingBox.cpp in Sources */, - 3E3D763C1C82B30A00091C4D /* NativeVertexFormat.cpp in Sources */, + 3E3D76391C82B30A00091C4D /* OGLBoundingBox.cpp in Sources */, + 3E3D763C1C82B30A00091C4D /* OGLNativeVertexFormat.cpp in Sources */, EE149B8D2059E116008D5DDE /* OGLPipeline.cpp in Sources */, EE149B8C2059E116008D5DDE /* OGLShader.cpp in Sources */, - 3E3D763D1C82B30A00091C4D /* PerfQuery.cpp in Sources */, - 3E3D76461C82B30A00091C4D /* VertexManager.cpp in Sources */, - 3E3D763B1C82B30A00091C4D /* main.cpp in Sources */, - 3EFF29571F85A24400B4FD11 /* Render.cpp in Sources */, + 3E3D763D1C82B30A00091C4D /* OGLPerfQuery.cpp in Sources */, + 3E3D76461C82B30A00091C4D /* OGLVertexManager.cpp in Sources */, + 3E3D763B1C82B30A00091C4D /* OGLMain.cpp in Sources */, + 3EFF29571F85A24400B4FD11 /* OGLRender.cpp in Sources */, 3E79CEC11F89390B003D1BD9 /* ProgramShaderCache.cpp in Sources */, 3EFF27061F845F0300B4FD11 /* OGLTexture.cpp in Sources */, 3E3D76421C82B30A00091C4D /* SamplerCache.cpp in Sources */, - 3E3D76431C82B30A00091C4D /* StreamBuffer.cpp in Sources */, + 3E3D76431C82B30A00091C4D /* OGLStreamBuffer.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -9913,6 +9881,7 @@ files = ( EE3EC3ED224A819A00BA7436 /* imgui_draw.cpp in Sources */, EE8DD27322492AD8005E1AF5 /* imgui.cpp in Sources */, + 5550902727FA989A00CA618C /* imgui_tables.cpp in Sources */, EE3EC3EC224A819500BA7436 /* imgui_widgets.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -10069,11 +10038,6 @@ target = AECE51C4C7E0411EA86B7548 /* pch */; targetProxy = 09FFF5426424494E9658A566 /* PBXContainerItemProxy */; }; - 0AFA40AA076E45D1ACD9958B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = AECE51C4C7E0411EA86B7548 /* pch */; - targetProxy = F1A037FE65A947509FF551F8 /* PBXContainerItemProxy */; - }; 17AF2342229349D199D36146 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 9C44D53AD3A548718E1CFB61 /* ALL_BUILD */; @@ -10084,185 +10048,175 @@ target = 42A1E11FFDFD470D8368323A /* core */; targetProxy = 466AAC66DCE0412DB5ABDFF9 /* PBXContainerItemProxy */; }; - 34377890D64F4D2EB998EAA4 /* PBXTargetDependency */ = { + 5550902C27FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = EE8DD2D7224A7F04005E1AF5 /* FreeSurround */; + targetProxy = 5550902B27FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550902E27FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = EEC94A52224ABFDC00F85ABA /* OGLCompilersDLL */; + targetProxy = 5550902D27FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550903027FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = EE475745224AB2F30027BA05 /* SPIRV */; + targetProxy = 5550902F27FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550903227FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = C8D71164030546149D73799E /* SoundTouch */; - targetProxy = 254D0F01EF154DD7AD279062 /* PBXContainerItemProxy */; + targetProxy = 5550903127FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3E8D27CF1D21DA830086BA59 /* PBXTargetDependency */ = { + 5550903427FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 3E8D26021D21D9A70086BA59 /* curl */; - targetProxy = 3E8D27CE1D21DA830086BA59 /* PBXContainerItemProxy */; + target = FFA5E2D5A7C543E9AEF69BE8 /* audiocommon */; + targetProxy = 5550903327FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3EFF25971F84441100B4FD11 /* PBXTargetDependency */ = { + 5550903627FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 3EFF25251F84437500B4FD11 /* hidapi */; - targetProxy = 3EFF25961F84441100B4FD11 /* PBXContainerItemProxy */; + target = 79836D15F4E048CFBA06C188 /* bdisasm */; + targetProxy = 5550903527FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3EFF27941F84622700B4FD11 /* PBXTargetDependency */ = { + 5550903827FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = EE98C00E24B91E1700FFFDD7 /* bzip2 */; + targetProxy = 5550903727FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550903A27FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 43265322269841A88B884F87 /* common */; + targetProxy = 5550903927FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550903C27FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 3EFF277E1F8461CA00B4FD11 /* cubeb */; - targetProxy = 3EFF27931F84622700B4FD11 /* PBXContainerItemProxy */; + targetProxy = 5550903B27FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3EFF28801F85528100B4FD11 /* PBXTargetDependency */ = { + 5550903E27FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 3EFF28651F85514300B4FD11 /* libusb */; - targetProxy = 3EFF287F1F85528100B4FD11 /* PBXContainerItemProxy */; + target = 3E8D26021D21D9A70086BA59 /* curl */; + targetProxy = 5550903D27FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3EFF28881F85580B00B4FD11 /* PBXTargetDependency */ = { + 5550904027FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = B0D48831F54442B2AEF377D1 /* miniupnpc */; - targetProxy = 3EFF28871F85580B00B4FD11 /* PBXContainerItemProxy */; + target = CA310A90E1D643F2BE825C01 /* discio */; + targetProxy = 5550903F27FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3EFF288F1F8559A100B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 93DC42BE7F7E4655BA37E803 /* sfml-network */; - targetProxy = 3EFF288E1F8559A100B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF28911F8559A100B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = B7D6D77CD9AE47AE971CBE25 /* sfml-system */; - targetProxy = 3EFF28901F8559A100B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF28951F8559F300B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3E3D76A31C839C5400091C4D /* mbedtls */; - targetProxy = 3EFF28941F8559F300B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF28981F855A1D00B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = F4243CD8A395409DB8AF7197 /* png */; - targetProxy = 3EFF28971F855A1D00B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF289B1F855B7700B4FD11 /* PBXTargetDependency */ = { + 5550904227FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 3E3D76801C839B2E00091C4D /* enet */; - targetProxy = 3EFF289A1F855B7700B4FD11 /* PBXContainerItemProxy */; + targetProxy = 5550904127FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3EFF28A41F855BD100B4FD11 /* PBXTargetDependency */ = { + 5550904427FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = B25C5C437ED44D7A82B1AAEE /* lzo2 */; - targetProxy = 3EFF28A31F855BD100B4FD11 /* PBXContainerItemProxy */; + target = EE3A464922B6874500031B56 /* fmt */; + targetProxy = 5550904327FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3EFF28B01F855CE900B4FD11 /* PBXTargetDependency */ = { + 5550904627FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = FFA5E2D5A7C543E9AEF69BE8 /* audiocommon */; - targetProxy = 3EFF28AF1F855CE900B4FD11 /* PBXContainerItemProxy */; + target = EEF4EECC224AAF5D0077748D /* glslang */; + targetProxy = 5550904527FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3EFF28B21F855CE900B4FD11 /* PBXTargetDependency */ = { + 5550904827FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3EFF25251F84437500B4FD11 /* hidapi */; + targetProxy = 5550904727FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550904A27FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = EE8DD26A22492AAB005E1AF5 /* imgui */; + targetProxy = 5550904927FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550904C27FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 75A40CDC6A8F4D759F46EA48 /* inputcommon */; - targetProxy = 3EFF28B11F855CE900B4FD11 /* PBXContainerItemProxy */; + targetProxy = 5550904B27FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3EFF28B61F855CE900B4FD11 /* PBXTargetDependency */ = { + 5550904E27FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = F603B7AA040D462DA9BCE40B /* videocommon */; - targetProxy = 3EFF28B51F855CE900B4FD11 /* PBXContainerItemProxy */; + target = 3EFF28651F85514300B4FD11 /* libusb */; + targetProxy = 5550904D27FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3EFF28BC1F855D2600B4FD11 /* PBXTargetDependency */ = { + 5550905027FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 43265322269841A88B884F87 /* common */; - targetProxy = 3EFF28BB1F855D2600B4FD11 /* PBXContainerItemProxy */; + target = EE98BE9A24B8FC5600FFFDD7 /* lzma */; + targetProxy = 5550904F27FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3EFF28C41F855DF200B4FD11 /* PBXTargetDependency */ = { + 5550905227FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = B6E9C99F5466426CB1BE4600 /* videoogl */; - targetProxy = 3EFF28C31F855DF200B4FD11 /* PBXContainerItemProxy */; + target = B25C5C437ED44D7A82B1AAEE /* lzo2 */; + targetProxy = 5550905127FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3EFF28C61F855DF200B4FD11 /* PBXTargetDependency */ = { + 5550905427FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = D825688E394642D19FD24A29 /* videosoftware */; - targetProxy = 3EFF28C51F855DF200B4FD11 /* PBXContainerItemProxy */; + target = 3E3D76A31C839C5400091C4D /* mbedtls */; + targetProxy = 5550905327FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3EFF28EC1F85606C00B4FD11 /* PBXTargetDependency */ = { + 5550905627FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = B0D48831F54442B2AEF377D1 /* miniupnpc */; - targetProxy = 3EFF28ED1F85606C00B4FD11 /* PBXContainerItemProxy */; + targetProxy = 5550905527FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3EFF28EE1F85606C00B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 93DC42BE7F7E4655BA37E803 /* sfml-network */; - targetProxy = 3EFF28EF1F85606C00B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF28F01F85606C00B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = B7D6D77CD9AE47AE971CBE25 /* sfml-system */; - targetProxy = 3EFF28F11F85606C00B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF28F41F85606C00B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = AECE51C4C7E0411EA86B7548 /* pch */; - targetProxy = 3EFF28F51F85606C00B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF28F61F85606C00B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = FFA5E2D5A7C543E9AEF69BE8 /* audiocommon */; - targetProxy = 3EFF28F71F85606C00B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF28F81F85606C00B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = CA310A90E1D643F2BE825C01 /* discio */; - targetProxy = 3EFF28F91F85606C00B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF28FA1F85606C00B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 75A40CDC6A8F4D759F46EA48 /* inputcommon */; - targetProxy = 3EFF28FB1F85606C00B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF28FC1F85606C00B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = B25C5C437ED44D7A82B1AAEE /* lzo2 */; - targetProxy = 3EFF28FD1F85606C00B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF28FE1F85606C00B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 79836D15F4E048CFBA06C188 /* bdisasm */; - targetProxy = 3EFF28FF1F85606C00B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF29001F85606C00B4FD11 /* PBXTargetDependency */ = { + 5550905827FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = F4243CD8A395409DB8AF7197 /* png */; - targetProxy = 3EFF29011F85606C00B4FD11 /* PBXContainerItemProxy */; + targetProxy = 5550905727FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 3EFF29021F85606C00B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = C8D71164030546149D73799E /* SoundTouch */; - targetProxy = 3EFF29031F85606C00B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF29041F85606C00B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 43265322269841A88B884F87 /* common */; - targetProxy = 3EFF29051F85606C00B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF29211F8560DC00B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3EFF28EB1F85606C00B4FD11 /* videonull */; - targetProxy = 3EFF29201F8560DC00B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF293A1F8562C700B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 79836D15F4E048CFBA06C188 /* bdisasm */; - targetProxy = 3EFF29391F8562C700B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF293D1F85630E00B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = CA310A90E1D643F2BE825C01 /* discio */; - targetProxy = 3EFF293C1F85630E00B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF29471F8567DA00B4FD11 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A33327301E8D455CABCEF3CE /* uicommon */; - targetProxy = 3EFF29461F8567DA00B4FD11 /* PBXContainerItemProxy */; - }; - 3EFF295E1F85D07E00B4FD11 /* PBXTargetDependency */ = { + 5550905A27FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 3EFF27751F8461BC00B4FD11 /* pugixml */; - targetProxy = 3EFF295D1F85D07E00B4FD11 /* PBXContainerItemProxy */; + targetProxy = 5550905927FA9E6A00CA618C /* PBXContainerItemProxy */; }; - 55F803F7B2124798AFEEB3B3 /* PBXTargetDependency */ = { + 5550905C27FA9E6A00CA618C /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = AECE51C4C7E0411EA86B7548 /* pch */; - targetProxy = 59D36B0EEF3C451FAD897DE8 /* PBXContainerItemProxy */; + target = 93DC42BE7F7E4655BA37E803 /* sfml-network */; + targetProxy = 5550905B27FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550905E27FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B7D6D77CD9AE47AE971CBE25 /* sfml-system */; + targetProxy = 5550905D27FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550906027FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A33327301E8D455CABCEF3CE /* uicommon */; + targetProxy = 5550905F27FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550906227FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = F603B7AA040D462DA9BCE40B /* videocommon */; + targetProxy = 5550906127FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550906427FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3EFF28EB1F85606C00B4FD11 /* videonull */; + targetProxy = 5550906327FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550906627FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B6E9C99F5466426CB1BE4600 /* videoogl */; + targetProxy = 5550906527FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550906827FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D825688E394642D19FD24A29 /* videosoftware */; + targetProxy = 5550906727FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550906A27FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = EE3EC41D224AA01500BA7436 /* videovulkan */; + targetProxy = 5550906927FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550906C27FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 8378DE981A7862DA003DA046 /* xxhash */; + targetProxy = 5550906B27FA9E6A00CA618C /* PBXContainerItemProxy */; + }; + 5550906E27FA9E6A00CA618C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = EE98BE1F24B8F60B00FFFDD7 /* zstd */; + targetProxy = 5550906D27FA9E6A00CA618C /* PBXContainerItemProxy */; }; 5A2D4C59687F475DA9817249 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -10304,21 +10258,11 @@ target = 8355D4921A6538FD00E73302 /* dolphin */; targetProxy = 8355D4DF1A653AA900E73302 /* PBXContainerItemProxy */; }; - 8378DED01A786335003DA046 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8378DE981A7862DA003DA046 /* xxhash */; - targetProxy = 8378DECF1A786335003DA046 /* PBXContainerItemProxy */; - }; 8C69B192B58A4CD192AFAB29 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = AECE51C4C7E0411EA86B7548 /* pch */; targetProxy = 26E0C22CEF7645D3BE41B352 /* PBXContainerItemProxy */; }; - 93498BA6ECB9420391134E30 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = F4243CD8A395409DB8AF7197 /* png */; - targetProxy = 1F3712C0751541BD9CBB8D1A /* PBXContainerItemProxy */; - }; 94515B6B806A471292AF088C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = CA310A90E1D643F2BE825C01 /* discio */; @@ -10329,16 +10273,6 @@ target = 75A40CDC6A8F4D759F46EA48 /* inputcommon */; targetProxy = 16469969B84F4F83A5EC4A42 /* PBXContainerItemProxy */; }; - A88BDD87229C4AB5B4903635 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = D825688E394642D19FD24A29 /* videosoftware */; - targetProxy = F8D769758A4A4B5EB3C5F577 /* PBXContainerItemProxy */; - }; - AE8B9146B6514DB4986FDB1F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = B6E9C99F5466426CB1BE4600 /* videoogl */; - targetProxy = FE7AE5890A4A495E9268B01E /* PBXContainerItemProxy */; - }; C2964C9104E54F8C88C9CA79 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = FFA5E2D5A7C543E9AEF69BE8 /* audiocommon */; @@ -10364,61 +10298,11 @@ target = 78EB5DD882C940F38B15BB6E /* ZERO_CHECK */; targetProxy = D7274BE2C84A4C7796EF0FBC /* PBXContainerItemProxy */; }; - D4FBA138615947188B0D1C32 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = AECE51C4C7E0411EA86B7548 /* pch */; - targetProxy = 64A64D118E9A420FA0458C02 /* PBXContainerItemProxy */; - }; EE09ECF225AFAC6D002C9E67 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 3E2217961D74AB3300C55942 /* Wii */; targetProxy = EE09ECF125AFAC6D002C9E67 /* PBXContainerItemProxy */; }; - EE3A465E22B687FA00031B56 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = EE3A464922B6874500031B56 /* fmt */; - targetProxy = EE3A465D22B687FA00031B56 /* PBXContainerItemProxy */; - }; - EE3EC41E224AA01500BA7436 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = D825688E394642D19FD24A29 /* videosoftware */; - targetProxy = EE3EC41F224AA01500BA7436 /* PBXContainerItemProxy */; - }; - EE3EC449224AA0A800BA7436 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = EE3EC41D224AA01500BA7436 /* videovulkan */; - targetProxy = EE3EC448224AA0A800BA7436 /* PBXContainerItemProxy */; - }; - EE475775224AB34C0027BA05 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = EE475745224AB2F30027BA05 /* SPIRV */; - targetProxy = EE475774224AB34C0027BA05 /* PBXContainerItemProxy */; - }; - EE47577B224AB4D20027BA05 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = EE3EC41D224AA01500BA7436 /* videovulkan */; - targetProxy = EE47577A224AB4D20027BA05 /* PBXContainerItemProxy */; - }; - EE47577D224AB5E60027BA05 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = EE475745224AB2F30027BA05 /* SPIRV */; - targetProxy = EE47577C224AB5E60027BA05 /* PBXContainerItemProxy */; - }; - EE8DD2C3224A7D86005E1AF5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = EE8DD26A22492AAB005E1AF5 /* imgui */; - targetProxy = EE8DD2C2224A7D86005E1AF5 /* PBXContainerItemProxy */; - }; - EE8DD2EC224A7F73005E1AF5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = EE8DD2D7224A7F04005E1AF5 /* FreeSurround */; - targetProxy = EE8DD2EB224A7F73005E1AF5 /* PBXContainerItemProxy */; - }; - EE98BE9724B8F68D00FFFDD7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = EE98BE1F24B8F60B00FFFDD7 /* zstd */; - targetProxy = EE98BE9624B8F68D00FFFDD7 /* PBXContainerItemProxy */; - }; EEC94A65224AC08500F85ABA /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = EEC94A52224ABFDC00F85ABA /* OGLCompilersDLL */; @@ -10429,21 +10313,6 @@ target = EEC94A52224ABFDC00F85ABA /* OGLCompilersDLL */; targetProxy = EEC94A66224AC08F00F85ABA /* PBXContainerItemProxy */; }; - EECD3720224AAAD5000AE115 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = A33327301E8D455CABCEF3CE /* uicommon */; - targetProxy = EECD371F224AAAD5000AE115 /* PBXContainerItemProxy */; - }; - EEE07D3B22C272CE006D46FD /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = FFA5E2D5A7C543E9AEF69BE8 /* audiocommon */; - targetProxy = EEE07D3A22C272CE006D46FD /* PBXContainerItemProxy */; - }; - EEF4EF0C224AAFFE0077748D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = EEF4EECC224AAF5D0077748D /* glslang */; - targetProxy = EEF4EF0B224AAFFE0077748D /* PBXContainerItemProxy */; - }; F0F0B91A290E446F9A6D531B /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = AECE51C4C7E0411EA86B7548 /* pch */; @@ -10625,10 +10494,10 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - EXCLUDED_ARCHS = "arm64e arm64"; EXECUTABLE_PREFIX = lib; EXECUTABLE_SUFFIX = .a; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = $SRCROOT/dolphin/Source/PCH/pch.h; GCC_PREPROCESSOR_DEFINITIONS = ( "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'", @@ -10730,7 +10599,6 @@ "$(inherited)", ); OTHER_LIBTOOLFLAGS = " "; - OTHER_REZFLAGS = ""; PRODUCT_NAME = "$(TARGET_NAME)-dol"; SECTORDER_FLAGS = ""; USE_HEADERMAP = NO; @@ -11468,6 +11336,7 @@ $SRCROOT/dolphin/Externals/liblzma/api, $SRCROOT/dolphin/Externals/zstd/lib, $SRCROOT/dolphin/Externals/fmt/include, + "\"$(SRCROOT)/dolphin/Externals/picojson\"", ); INSTALL_PATH = ""; LIBRARY_STYLE = STATIC; @@ -11759,7 +11628,8 @@ EXECUTABLE_SUFFIX = .a; FRAMEWORK_SEARCH_PATHS = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_PREFIX_HEADER = $SRCROOT/dolphin/Source/PCH/pch.h; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = $SRCROOT/CSafe.pch; GCC_PREPROCESSOR_DEFINITIONS = ( "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'", "'USER_DIR=\".dolphin-emu\"'", @@ -14372,7 +14242,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; COMBINE_HIDPI_IMAGES = YES; - CONFIGURATION_TEMP_DIR = $BUILD_DIR/$CONFIGURATION; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -14420,9 +14289,7 @@ LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.14.4; SDKROOT = macosx; - SHARED_PRECOMPS_DIR = $BUILD_DIR/$CONFIGURATION; STRIP_STYLE = debugging; - SYMROOT = $SRCROOT/build; USER_HEADER_SEARCH_PATHS = $SRCROOT/dolphin; }; name = Release; @@ -14500,7 +14367,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; COMBINE_HIDPI_IMAGES = YES; - CONFIGURATION_TEMP_DIR = $BUILD_DIR/$CONFIGURATION; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -14548,9 +14414,7 @@ LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.14.4; SDKROOT = macosx; - SHARED_PRECOMPS_DIR = $BUILD_DIR/$CONFIGURATION; STRIP_STYLE = debugging; - SYMROOT = $SRCROOT/build; USER_HEADER_SEARCH_PATHS = $SRCROOT/dolphin; }; name = MinSizeRel; @@ -14784,7 +14648,6 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - EXCLUDED_ARCHS = "arm64e arm64"; EXECUTABLE_PREFIX = lib; EXECUTABLE_SUFFIX = .a; FRAMEWORK_SEARCH_PATHS = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks; @@ -15326,10 +15189,10 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - EXCLUDED_ARCHS = "arm64e arm64"; EXECUTABLE_PREFIX = lib; EXECUTABLE_SUFFIX = .a; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = $SRCROOT/dolphin/Source/PCH/pch.h; GCC_PREPROCESSOR_DEFINITIONS = ( "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'", @@ -15429,7 +15292,6 @@ "$(inherited)", ); OTHER_LIBTOOLFLAGS = " "; - OTHER_REZFLAGS = ""; PRODUCT_NAME = "$(TARGET_NAME)-dol"; SECTORDER_FLAGS = ""; USE_HEADERMAP = NO; @@ -15516,7 +15378,8 @@ EXECUTABLE_SUFFIX = .a; FRAMEWORK_SEARCH_PATHS = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_PREFIX_HEADER = $SRCROOT/dolphin/Source/PCH/pch.h; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = $SRCROOT/CSafe.pch; GCC_PREPROCESSOR_DEFINITIONS = ( "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'", "'USER_DIR=\".dolphin-emu\"'", @@ -15936,12 +15799,13 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 5.0.16211; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; - EXCLUDED_ARCHS = "arm64e arm64"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = $SRCROOT/dolphin/Source/PCH/pch.h; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -15999,12 +15863,13 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; + CURRENT_PROJECT_VERSION = 5.0.16211; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - EXCLUDED_ARCHS = "arm64e arm64"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = $SRCROOT/dolphin/Source/PCH/pch.h; GCC_PREPROCESSOR_DEFINITIONS = ( "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'", @@ -16081,12 +15946,13 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; + CURRENT_PROJECT_VERSION = 5.0.16211; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - EXCLUDED_ARCHS = "arm64e arm64"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = $SRCROOT/dolphin/Source/PCH/pch.h; GCC_PREPROCESSOR_DEFINITIONS = ( "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'", @@ -16163,12 +16029,13 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; + CURRENT_PROJECT_VERSION = 5.0.16211; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - EXCLUDED_ARCHS = "arm64e arm64"; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = $SRCROOT/dolphin/Source/PCH/pch.h; GCC_PREPROCESSOR_DEFINITIONS = ( "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'", @@ -16552,7 +16419,6 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - EXCLUDED_ARCHS = "arm64e arm64"; EXECUTABLE_PREFIX = lib; EXECUTABLE_SUFFIX = .a; FRAMEWORK_SEARCH_PATHS = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks; @@ -16884,10 +16750,10 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - EXCLUDED_ARCHS = "arm64e arm64"; EXECUTABLE_PREFIX = lib; EXECUTABLE_SUFFIX = .a; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = $SRCROOT/dolphin/Source/PCH/pch.h; GCC_PREPROCESSOR_DEFINITIONS = ( "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'", @@ -16989,7 +16855,6 @@ "$(inherited)", ); OTHER_LIBTOOLFLAGS = " "; - OTHER_REZFLAGS = ""; PRODUCT_NAME = "$(TARGET_NAME)-dol"; SECTORDER_FLAGS = ""; USE_HEADERMAP = NO; @@ -17005,7 +16870,6 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - EXCLUDED_ARCHS = "arm64e arm64"; EXECUTABLE_PREFIX = lib; EXECUTABLE_SUFFIX = .a; FRAMEWORK_SEARCH_PATHS = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks; @@ -17078,10 +16942,10 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - EXCLUDED_ARCHS = "arm64e arm64"; EXECUTABLE_PREFIX = lib; EXECUTABLE_SUFFIX = .a; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = $SRCROOT/dolphin/Source/PCH/pch.h; GCC_PREPROCESSOR_DEFINITIONS = ( "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'", @@ -17183,7 +17047,6 @@ "$(inherited)", ); OTHER_LIBTOOLFLAGS = " "; - OTHER_REZFLAGS = ""; PRODUCT_NAME = "$(TARGET_NAME)-dol"; SECTORDER_FLAGS = ""; USE_HEADERMAP = NO; @@ -17265,7 +17128,8 @@ EXECUTABLE_SUFFIX = .a; FRAMEWORK_SEARCH_PATHS = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_PREFIX_HEADER = $SRCROOT/dolphin/Source/PCH/pch.h; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = $SRCROOT/CSafe.pch; GCC_PREPROCESSOR_DEFINITIONS = ( "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'", "'USER_DIR=\".dolphin-emu\"'", @@ -17387,6 +17251,7 @@ $SRCROOT/dolphin/Externals/liblzma/api, $SRCROOT/dolphin/Externals/zstd/lib, $SRCROOT/dolphin/Externals/fmt/include, + "\"$(SRCROOT)/dolphin/Externals/picojson\"", ); INSTALL_PATH = ""; LIBRARY_STYLE = STATIC; @@ -17450,7 +17315,8 @@ EXECUTABLE_SUFFIX = .a; FRAMEWORK_SEARCH_PATHS = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_PREFIX_HEADER = $SRCROOT/dolphin/Source/PCH/pch.h; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = $SRCROOT/CSafe.pch; GCC_PREPROCESSOR_DEFINITIONS = ( "'CMAKE_INTDIR=\"$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)\"'", "'USER_DIR=\".dolphin-emu\"'", @@ -17670,7 +17536,6 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - EXCLUDED_ARCHS = "arm64e arm64"; EXECUTABLE_PREFIX = lib; EXECUTABLE_SUFFIX = .a; FRAMEWORK_SEARCH_PATHS = /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks; @@ -17831,6 +17696,7 @@ $SRCROOT/dolphin/Externals/liblzma/api, $SRCROOT/dolphin/Externals/zstd/lib, $SRCROOT/dolphin/Externals/fmt/include, + "\"$(SRCROOT)/dolphin/Externals/picojson\"", ); INSTALL_PATH = ""; LIBRARY_STYLE = STATIC; @@ -20031,6 +19897,7 @@ HEADER_SEARCH_PATHS = ( $SRCROOT/dolphin/Source/Core, $SRCROOT/dolphin/Externals/imgui, + "\"$(SRCROOT)/dolphin/Externals/fmt/include\"", ); INSTALL_PATH = ""; LIBRARY_STYLE = STATIC; @@ -20097,6 +19964,7 @@ HEADER_SEARCH_PATHS = ( $SRCROOT/dolphin/Source/Core, $SRCROOT/dolphin/Externals/imgui, + "\"$(SRCROOT)/dolphin/Externals/fmt/include\"", ); INSTALL_PATH = ""; LIBRARY_STYLE = STATIC; @@ -20165,6 +20033,7 @@ HEADER_SEARCH_PATHS = ( $SRCROOT/dolphin/Source/Core, $SRCROOT/dolphin/Externals/imgui, + "\"$(SRCROOT)/dolphin/Externals/fmt/include\"", ); INSTALL_PATH = ""; LIBRARY_STYLE = STATIC; @@ -20233,6 +20102,7 @@ HEADER_SEARCH_PATHS = ( $SRCROOT/dolphin/Source/Core, $SRCROOT/dolphin/Externals/imgui, + "\"$(SRCROOT)/dolphin/Externals/fmt/include\"", ); INSTALL_PATH = ""; LIBRARY_STYLE = STATIC; @@ -22008,7 +21878,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; COMBINE_HIDPI_IMAGES = YES; - CONFIGURATION_TEMP_DIR = $BUILD_DIR/$CONFIGURATION; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -22056,9 +21925,7 @@ LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.14.4; SDKROOT = macosx; - SHARED_PRECOMPS_DIR = $BUILD_DIR/$CONFIGURATION; STRIP_STYLE = debugging; - SYMROOT = $SRCROOT/build; USER_HEADER_SEARCH_PATHS = $SRCROOT/dolphin; }; name = RelWithDebInfo; @@ -22127,6 +21994,7 @@ $SRCROOT/dolphin/Externals/liblzma/api, $SRCROOT/dolphin/Externals/zstd/lib, $SRCROOT/dolphin/Externals/fmt/include, + "\"$(SRCROOT)/dolphin/Externals/picojson\"", ); INSTALL_PATH = ""; LIBRARY_STYLE = STATIC; @@ -22301,7 +22169,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; COMBINE_HIDPI_IMAGES = YES; - CONFIGURATION_TEMP_DIR = $BUILD_DIR/$CONFIGURATION; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -22349,9 +22216,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.14.4; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; - SHARED_PRECOMPS_DIR = $BUILD_DIR/$CONFIGURATION; STRIP_STYLE = debugging; - SYMROOT = $SRCROOT/build; USER_HEADER_SEARCH_PATHS = $SRCROOT/dolphin; }; name = Debug;