archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-08 07:51:19 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Add support for case insensitive non-ASCII paths"

Browse source 
This reverts commit b46e45f402.
This commit is contained in:
ssimco 2022-09-08 16:46:00 +03:00
parent b46e45f402
commit 459d1f4d8d
5 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -82,7 +82,7 @@ find_package(CURL REQUIRED)
find_package(pugixml REQUIRED) find_package(pugixml REQUIRED)
find_package(imgui REQUIRED) find_package(imgui REQUIRED)
find_package(RapidJSON 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(libzip REQUIRED)
find_package(glslang REQUIRED) find_package(glslang REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)

1
src/Common/CMakeLists.txt
View file

@ -38,7 +38,6 @@ target_link_libraries(CemuCommon PRIVATE
CemuComponents CemuComponents
Boost::nowide Boost::nowide
Boost::filesystem Boost::filesystem
Boost::locale
glm::glm glm::glm
) )

3
src/Common/unix/FileStream_unix.cpp
View file

@ -1,5 +1,4 @@
#include "Common/unix/FileStream_unix.h" #include "Common/unix/FileStream_unix.h"
#include <boost/locale/conversion.hpp>
std::optional<fs::path> findPathCI(const fs::path& path) std::optional<fs::path> findPathCI(const fs::path& path)
{ {
@ -19,7 +18,7 @@ std::optional<fs::path> findPathCI(const fs::path& path)
for (auto&& dirEntry : fs::directory_iterator(parrentPath)) for (auto&& dirEntry : fs::directory_iterator(parrentPath))
{ {
std::string dirFName = dirEntry.path().filename().string(); 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; return dirEntry;
} }

6
src/main.cpp
View file

@ -19,9 +19,6 @@
#include "Common/ExceptionHandler/ExceptionHandler.h" #include "Common/ExceptionHandler/ExceptionHandler.h"
#include <boost/locale/generator.hpp>
#include <boost/locale.hpp>
#include <locale>
#include <wx/setup.h> #include <wx/setup.h>
#include "util/helpers/helpers.h" #include "util/helpers/helpers.h"
#include "config/ActiveSettings.h" #include "config/ActiveSettings.h"
@ -381,8 +378,7 @@ int main(int argc, char *argv[])
#endif #endif
if (!LaunchSettings::HandleCommandline(argc, argv)) if (!LaunchSettings::HandleCommandline(argc, argv))
return 0; return 0;
boost::locale::generator gen;
std::locale::global(gen(""));
ActiveSettings::LoadOnce(); ActiveSettings::LoadOnce();
HandlePostUpdate(); HandlePostUpdate();

1
vcpkg.json
View file

@ -22,7 +22,6 @@
"boost-range", "boost-range",
"boost-functional", "boost-functional",
"boost-dll", "boost-dll",
"boost-locale",
"boost-optional", "boost-optional",
"boost-signals2", "boost-signals2",
"boost-crc", "boost-crc",