From 35b4da0d4b7d90805fd165e5303fe86c468df308 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 14 Nov 2023 14:24:04 +0100 Subject: [PATCH] Set file encoding to UTF-8 Set minimal xmake version to 2.8.3 --- xmake.lua | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/xmake.lua b/xmake.lua index c5ff89b3a..0c406607b 100644 --- a/xmake.lua +++ b/xmake.lua @@ -20,7 +20,7 @@ local rendererBackends = { end if is_plat("wasm") then - add_ldflags('-sFULL_ES2 -sFULL_ES3', { public = true }) + add_ldflags("-sFULL_ES2", "-sFULL_ES3", { public = true }) remove_files("src/Nazara/OpenGLRenderer/Wrapper/EGL/**.cpp") else remove_files("src/Nazara/OpenGLRenderer/Wrapper/Web/**.cpp") @@ -219,15 +219,8 @@ end NazaraModules = modules --- add_extrafiles was added in xmake 2.8.2 but was broken for wildcard -if xmake.version():lt("2.8.3") then - add_extrafiles = function (...) - add_headerfiles(..., { install = false }) - end -end - set_project("NazaraEngine") -set_xmakever("2.7.3") +set_xmakever("2.8.3") includes("xmake/**.lua") @@ -386,6 +379,7 @@ add_includedirs("include") add_sysincludedirs("thirdparty/include") set_languages("c89", "cxx17") +set_encodings("utf-8") set_rundir("./bin/$(plat)_$(arch)_$(mode)") set_targetdir("./bin/$(plat)_$(arch)_$(mode)") set_warnings("allextra")