Fix build?

This commit is contained in:
Martín Lucas Golini
2024-06-12 00:20:26 -03:00
parent ab81bb3139
commit 01e232913b
3 changed files with 7 additions and 4 deletions

View File

@@ -404,8 +404,10 @@ function build_base_cpp_configuration( package_name )
buildoptions{ "-fPIC" }
end
if is_vs() then
buildoptions { "/utf-8" }
if not is_vs() then
buildoptions{ "-std=c++17" }
else
buildoptions{ "/std:c++17", "/utf-8" }
end
set_ios_config()

View File

@@ -256,13 +256,14 @@ function build_base_cpp_configuration( package_name )
set_ios_config()
set_apple_config()
build_arch_configuration()
cppdialect "C++17"
if _OPTIONS["with-static-eepp"] then
defines { "EE_STATIC" }
end
filter "action:vs*"
buildoptions { "/utf-8" }
buildoptions{ "/std:c++17", "/utf-8" }
filter "action:not vs*"
buildoptions { "-Wall" }

View File

@@ -1309,7 +1309,7 @@ void Text::ensureGeometryUpdate() {
while ( run.hasNext() ) {
String::View curRun( run.curRun() );
FontTrueType* font = static_cast<FontTrueType*>( run.font() );
FontTrueType* font = run.font();
font->setCurrentSize( mFontStyleConfig.CharacterSize );
hb_buffer_reset( hbBuffer );