diff options
| author | ruki <[email protected]> | 2025-12-15 13:41:50 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-12-15 13:41:50 +0800 |
| commit | fb06feeb88ecd2512a4a737d7e543b88892ad783 (patch) | |
| tree | 02dcca161c9389b28ef04d3b0af4967b4530377d /core | |
| parent | 777fdde191dc443aba4b987c07247446e10bb5d9 (diff) | |
| parent | 1243c8ca1a3edbbdc5d4669f6be199bd3f20e0e8 (diff) | |
Merge pull request #7125 from xmake-io/cosmocc
fix cosmocc ci
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/xmake/engine.c | 9 | ||||
| -rw-r--r-- | core/src/xmake/xmake.lua | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/core/src/xmake/engine.c b/core/src/xmake/engine.c index b7d071b65..530071a68 100644 --- a/core/src/xmake/engine.c +++ b/core/src/xmake/engine.c @@ -714,9 +714,8 @@ static lua_State *g_lua = tb_null; // the xmake script files data #ifdef XM_EMBED_ENABLE -static tb_byte_t g_xmake_xmz_data[] = { -#include "xmake.xmz.h" -}; +extern tb_byte_t _binary_xmake_xmz_start[]; +extern tb_byte_t _binary_xmake_xmz_end[]; #endif /* ////////////////////////////////////////////////////////////////////////////////////// @@ -1401,8 +1400,8 @@ static tb_bool_t xm_engine_extract_programfiles_impl(xm_engine_t *engine, static tb_bool_t xm_engine_extract_programfiles(xm_engine_t *engine, tb_char_t const *programdir) { tb_file_info_t info = { 0 }; if (!tb_file_info(programdir, &info)) { - tb_byte_t const *data = g_xmake_xmz_data; - tb_size_t size = sizeof(g_xmake_xmz_data); + tb_byte_t const *data = _binary_xmake_xmz_start; + tb_size_t size = _binary_xmake_xmz_end - _binary_xmake_xmz_start; if (!xm_engine_extract_programfiles_impl(engine, programdir, data, size)) { return tb_false; } diff --git a/core/src/xmake/xmake.lua b/core/src/xmake/xmake.lua index 0883d071b..90f761b30 100644 --- a/core/src/xmake/xmake.lua +++ b/core/src/xmake/xmake.lua @@ -61,11 +61,11 @@ target("xmake") end -- embed all script files - add_rules("utils.bin2c", {linewidth = 16, extensions = ".xmz"}) + add_rules("utils.bin2obj", {extensions = ".xmz"}) on_config(function (target) import("utils.archive.archive") if has_config("embed") then - local archivefile = path.join(target:autogendir(), "bin2c", "xmake.xmz") + local archivefile = path.join(target:autogendir(), "bin2obj", "xmake.xmz") print("archiving %s ..", archivefile) os.tryrm(archivefile) local rootdir = path.normalize(path.join(os.projectdir(), "..", "xmake")) |