From e11fd90c2eb37bd5e61cc7a0bcdc9dc0195d8b4d Mon Sep 17 00:00:00 2001 From: actboy168 Date: Sat, 29 Jun 2024 14:17:15 +0800 Subject: [PATCH] update bee --- 3rd/bee.lua | 2 +- compile/common/launcher.lua | 3 --- compile/common/lua-debug.lua | 3 --- compile/common/runtime.lua | 6 ------ compile/windows/make.lua | 1 + compile/windows/runtime.lua | 4 ++++ 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/3rd/bee.lua b/3rd/bee.lua index 9c8c8216..1ef74f78 160000 --- a/3rd/bee.lua +++ b/3rd/bee.lua @@ -1 +1 @@ -Subproject commit 9c8c8216e652cce63f612cf2232eaae1ce49d3b7 +Subproject commit 1ef74f784074eea3befa776b7ddeac6fc08cc0c8 diff --git a/compile/common/launcher.lua b/compile/common/launcher.lua index 34844b6b..2794da3c 100644 --- a/compile/common/launcher.lua +++ b/compile/common/launcher.lua @@ -29,9 +29,6 @@ lm:lua_src 'launcher_source' { defines = { "BEE_INLINE", }, - msvc = { - flags = "/utf-8", - }, windows = { defines = "_CRT_SECURE_NO_WARNINGS", links = { diff --git a/compile/common/lua-debug.lua b/compile/common/lua-debug.lua index a457a4f4..40e7348d 100644 --- a/compile/common/lua-debug.lua +++ b/compile/common/lua-debug.lua @@ -12,9 +12,6 @@ if lm.os == "windows" then "src/process_inject/windows/*.cpp", "3rd/wow64ext/src/wow64ext.cpp", }, - msvc = { - flags = "/utf-8", - }, links = "advapi32", } end diff --git a/compile/common/runtime.lua b/compile/common/runtime.lua index 81efef5e..6d615ca1 100644 --- a/compile/common/runtime.lua +++ b/compile/common/runtime.lua @@ -46,9 +46,6 @@ lm:source_set 'luadbg' { sources = { "src/luadebug/luadbg/*.cpp", }, - msvc = { - flags = "/utf-8", - }, linux = { flags = "-fPIC" }, @@ -223,9 +220,6 @@ for _, luaver in ipairs { "src/luadebug/util/*.cpp", "src/luadebug/"..compat[luaver].."/**/*.cpp", }, - msvc = { - flags = "/utf-8", - }, windows = { deps = luaver..'/'..luaver, defines = { diff --git a/compile/windows/make.lua b/compile/windows/make.lua index 45ae6e86..dfb5b85e 100644 --- a/compile/windows/make.lua +++ b/compile/windows/make.lua @@ -2,6 +2,7 @@ local lm = require "luamake" lm.arch = "x86" lm.runtime_platform = "win32-ia32" + require "compile.windows.runtime" require "compile.common.run_luamake" diff --git a/compile/windows/runtime.lua b/compile/windows/runtime.lua index e99c0d4d..233903d0 100644 --- a/compile/windows/runtime.lua +++ b/compile/windows/runtime.lua @@ -1,5 +1,9 @@ local lm = require "luamake" +lm:conf { + flags = "/utf-8", +} + require "compile.common.config" local platform = lm.runtime_platform