From 186d9df01dce00af465c2b3e21277d3bb99c9e4c Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Fri, 1 Oct 2021 11:28:33 +0200 Subject: Removed `-fshort-wchar` compiler flag on Linux --- xmake.lua | 1 - zencore/include/zencore/zencore.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/xmake.lua b/xmake.lua index e75c40e58..4f7612f72 100644 --- a/xmake.lua +++ b/xmake.lua @@ -47,7 +47,6 @@ if is_os("windows") then end if is_os("linux") then - add_cxxflags("-fshort-wchar") add_cxxflags("-Wno-unused-variable") add_cxxflags("-Wno-unused-parameter") add_cxxflags("-Wno-strict-aliasing") diff --git a/zencore/include/zencore/zencore.h b/zencore/include/zencore/zencore.h index ba988f74a..136ed2944 100644 --- a/zencore/include/zencore/zencore.h +++ b/zencore/include/zencore/zencore.h @@ -64,8 +64,6 @@ # pragma warning(disable : 4324) // warning C4324: '': structure was padded due to alignment specifier #endif -static_assert(sizeof(wchar_t) == 2, "wchar_t is larger than expected"); - ////////////////////////////////////////////////////////////////////////// // Architecture // -- cgit v1.2.3