From 30900bbcd5f8f6229c1ceb1621af377dcafa070a Mon Sep 17 00:00:00 2001 From: CppCXY <812125110@qq.com> Date: Thu, 14 Apr 2022 22:41:57 +0800 Subject: [PATCH 1/2] reset --- 3rd/EmmyLuaCodeStyle | 2 +- make/code_format.lua | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/3rd/EmmyLuaCodeStyle b/3rd/EmmyLuaCodeStyle index ab534c069..8246ca187 160000 --- a/3rd/EmmyLuaCodeStyle +++ b/3rd/EmmyLuaCodeStyle @@ -1 +1 @@ -Subproject commit ab534c069ba4806fc4ef8b29005e07d651e40d4f +Subproject commit 8246ca187f166f9fa88c08076b4c1e16817de116 diff --git a/make/code_format.lua b/make/code_format.lua index 537aa2738..c62fb0ccb 100644 --- a/make/code_format.lua +++ b/make/code_format.lua @@ -23,15 +23,19 @@ lm:source_set 'code_format' { "CodeService/src/FormatElement/*.cpp", "CodeService/src/NameStyle/*.cpp" }, + windows = { + -- 不要开哦 + -- flasg = "/W3 /WX" + }, macos = { - -- macosx10.12不支持完整的std filesystem,只好砍功能 - defines = "NOT_SUPPORT_FILE_SYSTEM", + flags = "-Wall -Werror", }, linux = { - defines = (function () + defines = (function() if lm.platform == "linux-arm64" then return "NOT_SUPPORT_FILE_SYSTEM" end - end)() - }, + end)(), + flags = "-Wall -Werror" + } } From eeeff6ad7f8c9fdb7425d88e7d4f8fecb6f81095 Mon Sep 17 00:00:00 2001 From: CppCXY <812125110@qq.com> Date: Thu, 14 Apr 2022 22:52:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=B1=E4=BA=8E=E6=B2=A1=E5=88=B0mac10.1?= =?UTF-8?q?5=E5=9B=9E=E6=BB=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- make/code_format.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/make/code_format.lua b/make/code_format.lua index c62fb0ccb..6f5f120b8 100644 --- a/make/code_format.lua +++ b/make/code_format.lua @@ -29,6 +29,7 @@ lm:source_set 'code_format' { }, macos = { flags = "-Wall -Werror", + defines = "NOT_SUPPORT_FILE_SYSTEM" }, linux = { defines = (function()