diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | case.diff | 67 | ||||
| -rw-r--r-- | overlay.diff | 12 | ||||
| -rw-r--r-- | xdg.diff | 66 |
5 files changed, 85 insertions, 86 deletions
@@ -1,6 +1,6 @@ pkgbase = cemu pkgdesc = Software to emulate Wii U games and applications on PC (with cutting edge Linux patches) - pkgver = 2.0.104 + pkgver = 2.0.106 pkgrel = 1 url = https://cemu.info install = cemu.install @@ -23,7 +23,7 @@ pkgbase = cemu depends = libpng depends = wxwidgets-gtk3>=3.2 optdepends = vulkan-driver: Vulkan graphics - source = git+https://github.com/cemu-project/Cemu#commit=6cdb6eed1730cde23ede99099a12092b9abe8aa3 + source = git+https://github.com/cemu-project/Cemu#commit=1e851fe7e2e7a26e5a97d27fc07ffabec852ca0f source = imgui-1.88.tar.gz::https://github.com/ocornut/imgui/archive/refs/tags/v1.88.tar.gz source = imgui.cmake::https://raw.githubusercontent.com/microsoft/vcpkg/master/ports/imgui/CMakeLists.txt source = imgui.conf::https://raw.githubusercontent.com/microsoft/vcpkg/master/ports/imgui/imgui-config.cmake.in @@ -33,6 +33,7 @@ pkgbase = cemu source = git+https://github.com/google/googletest#commit=800f5422ac9d9e0ad59cd860a2ef3a679588acb4 source = xdg.diff source = overlay.diff + source = case.diff sha256sums = SKIP sha256sums = 9f14c788aee15b777051e48f868c5d4d959bd679fc5050e3d2a29de80d8fd32e sha256sums = 262faed507149c89aab7572fd2c2a968f843ca2900043e30a9c339735ed08a8f @@ -41,7 +42,8 @@ pkgbase = cemu sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = 78aa9187fa6a1819da039c10f1d2681b962329c9fc6d4724eeff5936b3ec02ee - sha256sums = 8447dc7fb7958a1ec12798a2d2fbb7da1174fa1afd7be76a94a2faccee61b19e + sha256sums = 65a4455f47386475ff1567ba94dbf281b928d52f7d69e4b733d7dc60ef96d1cb + sha256sums = 7ca0223ef7fae14399ca4e0148335052d8d5863d4a41c31ae6f72f26688a6834 + sha256sums = 09d19fd8975a22b10e57066516e76a57b7fbc08efd199c5133e40f1462b13b5f pkgname = cemu @@ -1,6 +1,6 @@ # Maintainer: Anuskuss <anuskuss@googlemail.com> pkgname=cemu -pkgver=2.0.104 +pkgver=2.0.106 pkgrel=1 pkgdesc='Software to emulate Wii U games and applications on PC (with cutting edge Linux patches)' arch=(x86_64) @@ -25,7 +25,7 @@ optdepends=( ) install=cemu.install source=( - git+https://github.com/cemu-project/Cemu#commit=6cdb6eed1730cde23ede99099a12092b9abe8aa3 + git+https://github.com/cemu-project/Cemu#commit=1e851fe7e2e7a26e5a97d27fc07ffabec852ca0f # dependencies imgui-1.88.tar.gz::https://github.com/ocornut/imgui/archive/refs/tags/v1.88.tar.gz imgui.cmake::https://raw.githubusercontent.com/microsoft/vcpkg/master/ports/imgui/CMakeLists.txt @@ -41,6 +41,7 @@ source=( # patches xdg.diff # 963f9b38349c5d03b26ab2a50ead2ee4e743ca41 overlay.diff # edeb14d4c68ee8bf500b990b13079177e01c25f1 + case.diff # dfe35375b72da312f5a70784f771938580cae4fe ) sha256sums=( SKIP @@ -51,8 +52,9 @@ sha256sums=( SKIP SKIP SKIP - 78aa9187fa6a1819da039c10f1d2681b962329c9fc6d4724eeff5936b3ec02ee - 8447dc7fb7958a1ec12798a2d2fbb7da1174fa1afd7be76a94a2faccee61b19e + 65a4455f47386475ff1567ba94dbf281b928d52f7d69e4b733d7dc60ef96d1cb + 7ca0223ef7fae14399ca4e0148335052d8d5863d4a41c31ae6f72f26688a6834 + 09d19fd8975a22b10e57066516e76a57b7fbc08efd199c5133e40f1462b13b5f ) pkgver() { @@ -93,9 +95,6 @@ prepare() { # glslang fix sed -i 's/GLSLANG_VERSION_LESS/GLSLANG_VERSION_GREATER/' src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp - # exit crash fix - sed -i 's/exit(0)/_exit(0)/g' src/gui/CemuApp.cpp - # experimental: xdg base dir (https://github.com/cemu-project/Cemu/pull/130) git apply "$srcdir/xdg.diff" sed -i 's|gameProfiles/default|gameProfiles|' src/Cafe/GameProfile/GameProfile.cpp @@ -103,6 +102,9 @@ prepare() { # experimental: linux overlay (https://github.com/cemu-project/Cemu/pull/142) rm -rf src/util/SystemInfo git apply "$srcdir/overlay.diff" + + # experimental: case insensitivity (https://github.com/cemu-project/Cemu/pull/196) + git apply "$srcdir/case.diff" } build() { diff --git a/case.diff b/case.diff new file mode 100644 index 000000000000..d01b5da0d8bf --- /dev/null +++ b/case.diff @@ -0,0 +1,67 @@ +--- a/src/Common/unix/FileStream_unix.cpp ++++ b/src/Common/unix/FileStream_unix.cpp +@@ -1,5 +1,31 @@ + #include "Common/unix/FileStream_unix.h" + ++std::optional<fs::path> findPathCI(const fs::path& path) ++{ ++ if (fs::exists(path)) return path; ++ if (!path.has_parent_path()) return {}; ++ auto parrentPath = path.parent_path(); ++ if (!fs::exists(parrentPath)) ++ { ++ auto tempParrentPath = findPathCI(parrentPath); ++ if (tempParrentPath.has_value()) ++ parrentPath = std::move(tempParrentPath.value()); ++ else ++ return {}; ++ } ++ std::string fName = path.filename().string(); ++ if (fs::exists(parrentPath)) ++ for (auto&& dirEntry : fs::directory_iterator(parrentPath)) ++ { ++ std::string dirFName = dirEntry.path().filename().string(); ++ if (boost::iequals(dirFName, fName)) ++ { ++ return dirEntry; ++ } ++ } ++ return parrentPath / fName; ++} ++ + FileStream* FileStream::openFile(std::string_view path) + { + return openFile2(path, false); +@@ -13,7 +39,7 @@ FileStream* FileStream::openFile(const wchar_t* path, bool allowWrite) + FileStream* FileStream::openFile2(const fs::path& path, bool allowWrite) + { + //return openFile(path.generic_wstring().c_str(), allowWrite); +- FileStream* fs = new FileStream(path, true, allowWrite); ++ FileStream* fs = new FileStream(findPathCI(path).value_or(path), true, allowWrite); + if (fs->m_isValid) + return fs; + delete fs; +@@ -32,7 +58,7 @@ FileStream* FileStream::createFile(std::string_view path) + + FileStream* FileStream::createFile2(const fs::path& path) + { +- FileStream* fs = new FileStream(path, false, false); ++ FileStream* fs = new FileStream(findPathCI(path).value_or(path), false, false); + if (fs->m_isValid) + return fs; + delete fs; +@@ -190,12 +216,12 @@ FileStream::FileStream(const fs::path& path, bool isOpen, bool isWriteable) + { + if (isOpen) + { +- m_fileStream.open(path, isWriteable ? (std::ios_base::in | std::ios_base::out | std::ios_base::binary) : (std::ios_base::in | std::ios_base::binary)); ++ m_fileStream.open(findPathCI(path).value_or(path), isWriteable ? (std::ios_base::in | std::ios_base::out | std::ios_base::binary) : (std::ios_base::in | std::ios_base::binary)); + m_isValid = m_fileStream.is_open(); + } + else + { +- m_fileStream.open(path, std::ios_base::in | std::ios_base::out | std::ios_base::binary | std::ios_base::trunc); ++ m_fileStream.open(findPathCI(path).value_or(path), std::ios_base::in | std::ios_base::out | std::ios_base::binary | std::ios_base::trunc); + m_isValid = m_fileStream.is_open(); + } + } diff --git a/overlay.diff b/overlay.diff index 339eb9eb8196..6be6cde2c278 100644 --- a/overlay.diff +++ b/overlay.diff @@ -1,5 +1,3 @@ -diff --git a/src/Cafe/HW/Latte/Core/LatteOverlay.cpp b/src/Cafe/HW/Latte/Core/LatteOverlay.cpp -index cb7c9ba..c8ba86a 100644 --- a/src/Cafe/HW/Latte/Core/LatteOverlay.cpp +++ b/src/Cafe/HW/Latte/Core/LatteOverlay.cpp @@ -12,30 +12,16 @@ @@ -149,9 +147,7 @@ index cb7c9ba..c8ba86a 100644 // update vram g_renderer->GetVRAMInfo(g_state.vramUsage, g_state.vramTotal); -diff --git a/src/util/SystemInfo/SystemInfo.cpp b/src/util/SystemInfo/SystemInfo.cpp new file mode 100644 -index 0000000..afda4e8 --- /dev/null +++ b/src/util/SystemInfo/SystemInfo.cpp @@ -0,0 +1,34 @@ @@ -190,9 +186,7 @@ index 0000000..afda4e8 + out.user = user; +} \ No newline at end of file -diff --git a/src/util/SystemInfo/SystemInfo.h b/src/util/SystemInfo/SystemInfo.h new file mode 100644 -index 0000000..1b14038 --- /dev/null +++ b/src/util/SystemInfo/SystemInfo.h @@ -0,0 +1,17 @@ @@ -214,9 +208,7 @@ index 0000000..1b14038 +void QueryProcTime(ProcessorTime &out); +void QueryCoreTimes(uint32 count, ProcessorTime out[]); \ No newline at end of file -diff --git a/src/util/SystemInfo/SystemInfoLinux.cpp b/src/util/SystemInfo/SystemInfoLinux.cpp new file mode 100644 -index 0000000..07fe9ae --- /dev/null +++ b/src/util/SystemInfo/SystemInfoLinux.cpp @@ -0,0 +1,67 @@ @@ -288,9 +280,7 @@ index 0000000..07fe9ae + +#endif \ No newline at end of file -diff --git a/src/util/SystemInfo/SystemInfoStub.cpp b/src/util/SystemInfo/SystemInfoStub.cpp new file mode 100644 -index 0000000..3d970d1 --- /dev/null +++ b/src/util/SystemInfo/SystemInfoStub.cpp @@ -0,0 +1,25 @@ @@ -320,9 +310,7 @@ index 0000000..3d970d1 + +#endif \ No newline at end of file -diff --git a/src/util/SystemInfo/SystemInfoWin.cpp b/src/util/SystemInfo/SystemInfoWin.cpp new file mode 100644 -index 0000000..2f39174 --- /dev/null +++ b/src/util/SystemInfo/SystemInfoWin.cpp @@ -0,0 +1,72 @@ @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e9f7458..9135c62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,13 @@ option(ENABLE_OPENGL "Enables the OpenGL backend" ON) @@ -27,8 +25,6 @@ index e9f7458..9135c62 100644 add_subdirectory("dependencies/ih264d" EXCLUDE_FROM_ALL) find_package(ZArchive) -diff --git a/src/Cafe/Account/Account.cpp b/src/Cafe/Account/Account.cpp -index f370c81..55fc824 100644 --- a/src/Cafe/Account/Account.cpp +++ b/src/Cafe/Account/Account.cpp @@ -424,7 +424,7 @@ OnlineValidator Account::ValidateOnlineFiles() const @@ -49,8 +45,6 @@ index f370c81..55fc824 100644 if (!fs::exists(seeprom)) result.seeprom = OnlineValidator::FileState::Missing; else if (fs::file_size(seeprom) != 512) -diff --git a/src/Cafe/CafeSystem.cpp b/src/Cafe/CafeSystem.cpp -index bfa5d82..50f46d1 100644 --- a/src/Cafe/CafeSystem.cpp +++ b/src/Cafe/CafeSystem.cpp @@ -289,7 +289,7 @@ uint32 loadSharedData() @@ -80,8 +74,6 @@ index bfa5d82..50f46d1 100644 FileStream* ramDumpFile = FileStream::openFile2(path); if (ramDumpFile) { -diff --git a/src/Cafe/Filesystem/FST/KeyCache.cpp b/src/Cafe/Filesystem/FST/KeyCache.cpp -index 7fedc3d..124611f 100644 --- a/src/Cafe/Filesystem/FST/KeyCache.cpp +++ b/src/Cafe/Filesystem/FST/KeyCache.cpp @@ -59,7 +59,7 @@ void KeyCache_Prepare() @@ -93,8 +85,6 @@ index 7fedc3d..124611f 100644 FileStream* fs_keys = FileStream::openFile2(keysPath); if( !fs_keys ) { -diff --git a/src/Cafe/GameProfile/GameProfile.cpp b/src/Cafe/GameProfile/GameProfile.cpp -index d3e930e..85de1f4 100644 --- a/src/Cafe/GameProfile/GameProfile.cpp +++ b/src/Cafe/GameProfile/GameProfile.cpp @@ -180,12 +180,12 @@ void gameProfile_load() @@ -121,8 +111,6 @@ index d3e930e..85de1f4 100644 FileStream* fs = FileStream::createFile2(gameProfilePath); if (!fs) { -diff --git a/src/Cafe/GraphicPack/GraphicPack2.cpp b/src/Cafe/GraphicPack/GraphicPack2.cpp -index 41e33a1..38e52bb 100644 --- a/src/Cafe/GraphicPack/GraphicPack2.cpp +++ b/src/Cafe/GraphicPack/GraphicPack2.cpp @@ -63,7 +63,7 @@ void GraphicPack2::LoadGraphicPack(fs::path graphicPackPath) @@ -134,8 +122,6 @@ index 41e33a1..38e52bb 100644 for (fs::recursive_directory_iterator it(basePath, ec); it != end(it); ++it) { if (!it->is_directory(ec)) -diff --git a/src/Cafe/HW/Latte/Core/LatteShaderCache.cpp b/src/Cafe/HW/Latte/Core/LatteShaderCache.cpp -index ebf425b..7ad99e4 100644 --- a/src/Cafe/HW/Latte/Core/LatteShaderCache.cpp +++ b/src/Cafe/HW/Latte/Core/LatteShaderCache.cpp @@ -197,17 +197,17 @@ void LatteShaderCache_load() @@ -161,8 +147,6 @@ index ebf425b..7ad99e4 100644 LatteShaderCache_handleDeprecatedCacheFiles(pathGeneric, pathGenericPre1_25_0, pathGenericPre1_16_0); // calculate extraVersion for transferable and precompiled shader cache -diff --git a/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.cpp b/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.cpp -index e9e86f5..dc088ae 100644 --- a/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.cpp +++ b/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.cpp @@ -279,7 +279,7 @@ void RendererShaderGL::ShaderCacheLoading_begin(uint64 cacheTitleId) @@ -174,8 +158,6 @@ index e9e86f5..dc088ae 100644 g_programBinaryCache = FileCache::Open(cachePath, true, cacheMagic); if (g_programBinaryCache == nullptr) cemuLog_log(LogType::Force, "Unable to open OpenGL precompiled cache {}", cacheFilename); -diff --git a/src/Cafe/HW/Latte/Renderer/Renderer.cpp b/src/Cafe/HW/Latte/Renderer/Renderer.cpp -index c7f7b81..366ce54 100644 --- a/src/Cafe/HW/Latte/Renderer/Renderer.cpp +++ b/src/Cafe/HW/Latte/Renderer/Renderer.cpp @@ -133,7 +133,7 @@ void Renderer::SaveScreenshot(const std::vector<uint8>& rgb_data, int width, int @@ -187,8 +169,6 @@ index c7f7b81..366ce54 100644 if (!fs::exists(screendir)) fs::create_directory(screendir); -diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp -index 7af5204..703c92d 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp @@ -456,7 +456,7 @@ void RendererShaderVk::ShaderCacheLoading_begin(uint64 cacheTitleId) @@ -200,8 +180,6 @@ index 7af5204..703c92d 100644 s_spirvCache = FileCache::Open(cachePath, true, spirvCacheMagic); if (s_spirvCache == nullptr) cemuLog_log(LogType::Force, "Unable to open SPIR-V cache {}", cacheFilename); -diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineStableCache.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineStableCache.cpp -index 50d5a25..b86b0a5 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineStableCache.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineStableCache.cpp @@ -32,8 +32,8 @@ VulkanPipelineStableCache& VulkanPipelineStableCache::GetInstance() @@ -215,8 +193,6 @@ index 50d5a25..b86b0a5 100644 // init cache loader state g_vkCacheState.pipelineLoadIndex = 0; -diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp -index 7c81a3c..8cf1f12 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanRenderer.cpp @@ -2305,7 +2305,7 @@ void VulkanRenderer::WaitCommandBufferFinished(uint64 commandBufferId) @@ -237,8 +213,6 @@ index 7c81a3c..8cf1f12 100644 if (fs::exists(dir)) { const auto filename = dir / fmt::format("{:016x}.bin", CafeSystem::GetForegroundTitleId()); -diff --git a/src/Cafe/HW/MMU/MMU.cpp b/src/Cafe/HW/MMU/MMU.cpp -index 87bf572..10d69ef 100644 --- a/src/Cafe/HW/MMU/MMU.cpp +++ b/src/Cafe/HW/MMU/MMU.cpp @@ -409,7 +409,7 @@ void memory_writeDumpFile(uint32 startAddr, uint32 size, const fs::path& path) @@ -250,8 +224,6 @@ index 87bf572..10d69ef 100644 fs::create_directories(path); for (auto& itr : g_mmuRanges) -diff --git a/src/Cafe/IOSU/legacy/iosu_crypto.cpp b/src/Cafe/IOSU/legacy/iosu_crypto.cpp -index 0433995..ef30a2b 100644 --- a/src/Cafe/IOSU/legacy/iosu_crypto.cpp +++ b/src/Cafe/IOSU/legacy/iosu_crypto.cpp @@ -563,7 +563,7 @@ void iosuCrypto_loadSSLCertificates() @@ -288,8 +260,6 @@ index 0433995..ef30a2b 100644 if (!fs::exists(seeprom_file, ec)) return IOS_CRYPTO_ONLINE_REQ_SEEPROM_MISSING; if (fs::file_size(seeprom_file, ec) != 512) -diff --git a/src/Cafe/OS/RPL/rpl.cpp b/src/Cafe/OS/RPL/rpl.cpp -index 90f9225..40c8e42 100644 --- a/src/Cafe/OS/RPL/rpl.cpp +++ b/src/Cafe/OS/RPL/rpl.cpp @@ -2122,7 +2122,7 @@ void RPLLoader_LoadDependency(rplDependency_t* dependency) @@ -301,8 +271,6 @@ index 90f9225..40c8e42 100644 auto fileData = FileStream::LoadIntoMemory(filePath); if (fileData) { -diff --git a/src/Cafe/OS/libs/coreinit/coreinit_FS.cpp b/src/Cafe/OS/libs/coreinit/coreinit_FS.cpp -index 3d13fdb..fb72ca8 100644 --- a/src/Cafe/OS/libs/coreinit/coreinit_FS.cpp +++ b/src/Cafe/OS/libs/coreinit/coreinit_FS.cpp @@ -107,7 +107,7 @@ namespace coreinit @@ -323,8 +291,6 @@ index 3d13fdb..fb72ca8 100644 fs::create_directories(path, ec); if (!FSCDeviceHostFS_Mount(mountPathOut, path.generic_wstring().c_str(), FSC_PRIORITY_BASE)) return FS_RESULT::ERR_PLACEHOLDER; -diff --git a/src/Cemu/Logging/CemuLogging.cpp b/src/Cemu/Logging/CemuLogging.cpp -index f58e798..6d403de 100644 --- a/src/Cemu/Logging/CemuLogging.cpp +++ b/src/Cemu/Logging/CemuLogging.cpp @@ -98,7 +98,7 @@ void cemuLog_createLogFile(bool triggeredByCrash) @@ -336,8 +302,6 @@ index f58e798..6d403de 100644 LogContext.file_stream.open(path, std::ios::out); if (LogContext.file_stream.fail()) { -diff --git a/src/Common/ExceptionHandler/ExceptionHandler_win32.cpp b/src/Common/ExceptionHandler/ExceptionHandler_win32.cpp -index 25dca26..9f38cdd 100644 --- a/src/Common/ExceptionHandler/ExceptionHandler_win32.cpp +++ b/src/Common/ExceptionHandler/ExceptionHandler_win32.cpp @@ -61,7 +61,7 @@ bool CreateMiniDump(CrashDump dump, EXCEPTION_POINTERS* pep) @@ -363,8 +327,6 @@ index 25dca26..9f38cdd 100644 } exit(0); -diff --git a/src/config/ActiveSettings.cpp b/src/config/ActiveSettings.cpp -index c7ff4fe..23bc364 100644 --- a/src/config/ActiveSettings.cpp +++ b/src/config/ActiveSettings.cpp @@ -18,7 +18,7 @@ void ActiveSettings::LoadOnce() @@ -438,8 +400,6 @@ index c7ff4fe..23bc364 100644 +{ + return GetDataPath("mlc01"); +} -diff --git a/src/config/ActiveSettings.h b/src/config/ActiveSettings.h -index 95ceae1..c47ebeb 100644 --- a/src/config/ActiveSettings.h +++ b/src/config/ActiveSettings.h @@ -13,6 +13,11 @@ public: @@ -522,8 +482,6 @@ index 95ceae1..c47ebeb 100644 inline static bool s_has_required_online_files = false; }; - -diff --git a/src/gui/CemuApp.cpp b/src/gui/CemuApp.cpp -index e78b30b..b1a72b0 100644 --- a/src/gui/CemuApp.cpp +++ b/src/gui/CemuApp.cpp @@ -115,7 +115,7 @@ bool CemuApp::OnInit() @@ -567,11 +525,9 @@ index e78b30b..b1a72b0 100644 } - -diff --git a/src/gui/ChecksumTool.cpp b/src/gui/ChecksumTool.cpp -index 74422c9..9787ffd 100644 --- a/src/gui/ChecksumTool.cpp +++ b/src/gui/ChecksumTool.cpp -@@ -133,7 +133,7 @@ ChecksumTool::ChecksumTool(wxWindow* parent, wxTitleManagerList::TitleEntry& ent +@@ -134,7 +134,7 @@ ChecksumTool::ChecksumTool(wxWindow* parent, wxTitleManagerList::TitleEntry& ent const auto title_id_str = fmt::format("{:016x}", m_json_entry.title_id); const auto default_file = fmt::format("{}_v{}.json", title_id_str, m_info.GetAppTitleVersion()); @@ -580,7 +536,7 @@ index 74422c9..9787ffd 100644 if (exists(checksum_path)) m_verify_online->Enable(); } -@@ -185,7 +185,7 @@ void ChecksumTool::LoadOnlineData() const +@@ -186,7 +186,7 @@ void ChecksumTool::LoadOnlineData() const std::string latest_commit; @@ -589,7 +545,7 @@ index 74422c9..9787ffd 100644 if (exists(checksum_path)) { std::string current_commit; -@@ -593,7 +593,7 @@ void ChecksumTool::OnVerifyOnline(wxCommandEvent& event) +@@ -594,7 +594,7 @@ void ChecksumTool::OnVerifyOnline(wxCommandEvent& event) const auto title_id_str = fmt::format("{:016x}", m_json_entry.title_id); const auto default_file = fmt::format("{}_v{}.json", title_id_str, m_info.GetAppTitleVersion()); @@ -598,8 +554,6 @@ index 74422c9..9787ffd 100644 if(!exists(checksum_path)) return; -diff --git a/src/gui/DownloadGraphicPacksWindow.cpp b/src/gui/DownloadGraphicPacksWindow.cpp -index 28e5bf6..6811b99 100644 --- a/src/gui/DownloadGraphicPacksWindow.cpp +++ b/src/gui/DownloadGraphicPacksWindow.cpp @@ -65,7 +65,7 @@ bool DownloadGraphicPacksWindow::curlDownloadFile(const char *url, curlDownloadF @@ -647,8 +601,6 @@ index 28e5bf6..6811b99 100644 size_t sbNameLen = strlen(sb.name); if(sbNameLen == 0) -diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp -index 8f26f81..2fb052e 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -997,7 +997,7 @@ void MainWindow::OnDebugSetting(wxCommandEvent& event) @@ -682,8 +634,6 @@ index 8f26f81..2fb052e 100644 } catch (const std::exception & ex) { -diff --git a/src/gui/MemorySearcherTool.cpp b/src/gui/MemorySearcherTool.cpp -index c7c6c73..3ecfff5 100644 --- a/src/gui/MemorySearcherTool.cpp +++ b/src/gui/MemorySearcherTool.cpp @@ -270,7 +270,7 @@ void MemorySearcherTool::OnFilter(wxCommandEvent& event) @@ -704,8 +654,6 @@ index c7c6c73..3ecfff5 100644 FileStream* fs = FileStream::createFile2(memorySearcherPath); if (fs) { -diff --git a/src/gui/debugger/DebuggerWindow2.cpp b/src/gui/debugger/DebuggerWindow2.cpp -index cca9bfb..e31031d 100644 --- a/src/gui/debugger/DebuggerWindow2.cpp +++ b/src/gui/debugger/DebuggerWindow2.cpp @@ -272,7 +272,7 @@ DebuggerWindow2::DebuggerWindow2(wxFrame& parent, const wxRect& display_size) @@ -726,8 +674,6 @@ index cca9bfb..e31031d 100644 } void DebuggerWindow2::OnBreakpointHit(wxCommandEvent& event) -diff --git a/src/gui/input/InputSettings2.cpp b/src/gui/input/InputSettings2.cpp -index 5793cbd..e48d2a2 100644 --- a/src/gui/input/InputSettings2.cpp +++ b/src/gui/input/InputSettings2.cpp @@ -669,10 +669,10 @@ void InputSettings2::on_profile_delete(wxCommandEvent& event) @@ -743,8 +689,6 @@ index 5793cbd..e48d2a2 100644 fs::remove(path); profile_names->ChangeValue(kDefaultProfileName); -diff --git a/src/input/InputManager.cpp b/src/input/InputManager.cpp -index 4ae43ce..852c918 100644 --- a/src/input/InputManager.cpp +++ b/src/input/InputManager.cpp @@ -76,9 +76,9 @@ bool InputManager::load(size_t player_index, std::string_view filename) @@ -799,8 +743,6 @@ index 4ae43ce..852c918 100644 if (!exists(path)) return {}; -diff --git a/src/main.cpp b/src/main.cpp -index f94b276..fb8baec 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -160,7 +160,7 @@ void _putenvSafe(const char* c) @@ -830,8 +772,6 @@ index f94b276..fb8baec 100644 for (auto& it : GetConfig().game_paths) CafeTitleList::AddScanPath(it); fs::path mlcPath = ActiveSettings::GetMlcPath(); -diff --git a/src/util/libusbWrapper/libusbWrapper.cpp b/src/util/libusbWrapper/libusbWrapper.cpp -index e1d7298..6e498c8 100644 --- a/src/util/libusbWrapper/libusbWrapper.cpp +++ b/src/util/libusbWrapper/libusbWrapper.cpp @@ -18,7 +18,7 @@ void libusbWrapper::init() |