From 459d1f4d8d31ccb8d9c3be17c4749433ac279973 Mon Sep 17 00:00:00 2001 From: ssimco Date: Thu, 8 Sep 2022 16:46:00 +0300 Subject: [PATCH] Revert "Add support for case insensitive non-ASCII paths" This reverts commit b46e45f40204f5b8753df240361a49f3498a2e61. --- CMakeLists.txt | 2 +- src/Common/CMakeLists.txt | 1 - src/Common/unix/FileStream_unix.cpp | 3 +-- src/main.cpp | 6 +----- vcpkg.json | 1 - 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9dfbc9b3..e9f7458e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,7 +82,7 @@ find_package(CURL REQUIRED) find_package(pugixml REQUIRED) find_package(imgui REQUIRED) find_package(RapidJSON REQUIRED) -find_package(Boost COMPONENTS program_options filesystem nowide locale REQUIRED) +find_package(Boost COMPONENTS program_options filesystem nowide REQUIRED) find_package(libzip REQUIRED) find_package(glslang REQUIRED) find_package(ZLIB REQUIRED) diff --git a/src/Common/CMakeLists.txt b/src/Common/CMakeLists.txt index 2d69cc93..f1654f31 100644 --- a/src/Common/CMakeLists.txt +++ b/src/Common/CMakeLists.txt @@ -38,7 +38,6 @@ target_link_libraries(CemuCommon PRIVATE CemuComponents Boost::nowide Boost::filesystem - Boost::locale glm::glm ) diff --git a/src/Common/unix/FileStream_unix.cpp b/src/Common/unix/FileStream_unix.cpp index 6a2804ab..936e3cf9 100644 --- a/src/Common/unix/FileStream_unix.cpp +++ b/src/Common/unix/FileStream_unix.cpp @@ -1,5 +1,4 @@ #include "Common/unix/FileStream_unix.h" -#include std::optional findPathCI(const fs::path& path) { @@ -19,7 +18,7 @@ std::optional findPathCI(const fs::path& path) for (auto&& dirEntry : fs::directory_iterator(parrentPath)) { std::string dirFName = dirEntry.path().filename().string(); - if (boost::equals(boost::locale::to_lower(dirFName), boost::locale::to_lower(fName))) + if (boost::iequals(dirFName, fName)) { return dirEntry; } diff --git a/src/main.cpp b/src/main.cpp index 20ad2ac5..f94b2761 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,9 +19,6 @@ #include "Common/ExceptionHandler/ExceptionHandler.h" -#include -#include -#include #include #include "util/helpers/helpers.h" #include "config/ActiveSettings.h" @@ -381,8 +378,7 @@ int main(int argc, char *argv[]) #endif if (!LaunchSettings::HandleCommandline(argc, argv)) return 0; - boost::locale::generator gen; - std::locale::global(gen("")); + ActiveSettings::LoadOnce(); HandlePostUpdate(); diff --git a/vcpkg.json b/vcpkg.json index ec4f62f7..519a5618 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -22,7 +22,6 @@ "boost-range", "boost-functional", "boost-dll", - "boost-locale", "boost-optional", "boost-signals2", "boost-crc",