From 01e232913ba85180eaa24170399f4eb7486c1c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Wed, 12 Jun 2024 00:20:26 -0300 Subject: [PATCH] Fix build? --- premake4.lua | 6 ++++-- premake5.lua | 3 ++- src/eepp/graphics/text.cpp | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/premake4.lua b/premake4.lua index 968809b06..2615db0c0 100644 --- a/premake4.lua +++ b/premake4.lua @@ -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() diff --git a/premake5.lua b/premake5.lua index 8f20ad0e8..6ea6c7c9b 100644 --- a/premake5.lua +++ b/premake5.lua @@ -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" } diff --git a/src/eepp/graphics/text.cpp b/src/eepp/graphics/text.cpp index 62d428aca..05451092c 100644 --- a/src/eepp/graphics/text.cpp +++ b/src/eepp/graphics/text.cpp @@ -1309,7 +1309,7 @@ void Text::ensureGeometryUpdate() { while ( run.hasNext() ) { String::View curRun( run.curRun() ); - FontTrueType* font = static_cast( run.font() ); + FontTrueType* font = run.font(); font->setCurrentSize( mFontStyleConfig.CharacterSize ); hb_buffer_reset( hbBuffer );