games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

fix boost.locale crash on macOS-arm64

Browse Source
This commit is contained in:
Andrey Filipenkov 2021-03-02 03:10:00 +03:00 committed by Arseniy Shestakov
parent 094486eec1
commit bc1d99431d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Global.h
View File

@ -191,7 +191,7 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/functional/hash.hpp> #include <boost/functional/hash.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#ifndef VCMI_ANDROID #ifdef VCMI_WINDOWS
#include <boost/locale/generator.hpp> #include <boost/locale/generator.hpp>
#endif #endif
#include <boost/logic/tribool.hpp> #include <boost/logic/tribool.hpp>

2
lib/VCMIDirs.cpp
View File

@ -654,7 +654,7 @@ namespace VCMIDirs
static bool initialized = false; static bool initialized = false;
if (!initialized) if (!initialized)
{ {
#ifndef VCMI_ANDROID #ifdef VCMI_WINDOWS
std::locale::global(boost::locale::generator().generate("en_US.UTF-8")); std::locale::global(boost::locale::generator().generate("en_US.UTF-8"));
#endif #endif
boost::filesystem::path::imbue(std::locale()); boost::filesystem::path::imbue(std::locale());