Skip to content

Commit 8ab26e9

Browse files
committed
update bee
1 parent a988903 commit 8ab26e9

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

3rd/bee.lua

Submodule bee.lua updated 100 files

compile/common/bee.lua

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@ lm:lua_src "source_bee" {
106106
defines = {
107107
lm.EXE ~= "lua" and "BEE_STATIC",
108108
},
109-
sources = "binding/*.cpp",
109+
sources = {
110+
"binding/*.cpp",
111+
"3rd/lua-patch/bee_newstate.c",
112+
},
110113
windows = {
111114
defines = "_CRT_SECURE_NO_WARNINGS",
112115
sources = {
@@ -168,7 +171,7 @@ lm:lua_src "source_bee" {
168171

169172
lm:source_set "source_lua" {
170173
includes = ".",
171-
sources = "3rd/lua/bee_utf8_crt.cpp",
174+
sources = "3rd/lua-patch/bee_utf8_crt.cpp",
172175
}
173176

174177
lm:source_set "source_lua" {
@@ -209,7 +212,7 @@ lm:source_set "source_lua" {
209212
"/wd4267",
210213
"/wd4334",
211214
},
212-
sources = ("3rd/lua/fast_setjmp_%s.s"):format(lm.arch)
215+
sources = ("3rd/lua-patch/fast_setjmp_%s.s"):format(lm.arch)
213216
},
214217
gcc = {
215218
flags = "-Wno-maybe-uninitialized",

compile/common/runtime.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ lm:source_set 'onelua' {
1717
},
1818
sources = {
1919
"src/luadebug/luadbg/onelua.c",
20-
"3rd/bee.lua/3rd/lua/bee_utf8_crt.cpp",
20+
"3rd/bee.lua/3rd/lua-patch/bee_utf8_crt.cpp",
2121
},
2222
msvc = {
23-
sources = ("3rd/bee.lua/3rd/lua/fast_setjmp_%s.s"):format(lm.arch)
23+
sources = ("3rd/bee.lua/3rd/lua-patch/fast_setjmp_%s.s"):format(lm.arch)
2424
},
2525
linux = {
2626
flags = "-fPIC"

src/luadebug/luadbg/bee_module.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
#include <bee/lua/module.h>
2222

23+
extern "C" {
24+
#include <3rd/lua-patch/bee_newstate.c>
25+
}
2326
#include <3rd/lua-seri/lua-seri.cpp>
2427
#include <bee/lua/error.cpp>
2528
#include <bee/lua/file.cpp>

0 commit comments

Comments
 (0)