mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 21:40:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_osg_utf8_build' into 'master'

Browse Source 
Fix build with OSG_USE_UTF8_FILENAME

See merge request OpenMW/openmw!3928
This commit is contained in:
psi29a 2024-03-07 09:09:11 +00:00
commit 65d51665e5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/misc/osgpluginchecker.cpp.in
View File

@ -41,7 +41,7 @@ namespace Misc
for (const auto& path : filepath) for (const auto& path : filepath)
{ {
#ifdef OSG_USE_UTF8_FILENAME #ifdef OSG_USE_UTF8_FILENAME
std::filesystem::path osgPath{ stringToU8String(path) }; std::filesystem::path osgPath{ StringUtils::stringToU8String(path) };
#else #else
std::filesystem::path osgPath{ path }; std::filesystem::path osgPath{ path };
#endif #endif
@ -52,7 +52,7 @@ namespace Misc
{ {
osgPath = osgPath.parent_path(); osgPath = osgPath.parent_path();
#ifdef OSG_USE_UTF8_FILENAME #ifdef OSG_USE_UTF8_FILENAME
std::string extraPath = u8StringToString(osgPath.u8string_view()); std::string extraPath = StringUtils::u8StringToString(osgPath.u8string());
#else #else
std::string extraPath = osgPath.string(); std::string extraPath = osgPath.string();
#endif #endif
@ -67,7 +67,7 @@ namespace Misc
if (std::find_if(availableOSGPlugins.begin(), availableOSGPlugins.end(), if (std::find_if(availableOSGPlugins.begin(), availableOSGPlugins.end(),
[&](std::string_view availablePlugin) { [&](std::string_view availablePlugin) {
#ifdef OSG_USE_UTF8_FILENAME #ifdef OSG_USE_UTF8_FILENAME
std::filesystem::path pluginPath{ stringToU8String(availablePlugin) }; std::filesystem::path pluginPath{ StringUtils::stringToU8String(availablePlugin) };
#else #else
std::filesystem::path pluginPath {availablePlugin}; std::filesystem::path pluginPath {availablePlugin};
#endif #endif