From 7f3d91339d89973d94e9bd710f0649b2fb606379 Mon Sep 17 00:00:00 2001 From: taynpg Date: Sat, 22 Feb 2025 22:41:12 +0800 Subject: [PATCH] =?UTF-8?q?rename=EF=BC=9A=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E4=BA=8C=E8=BF=9B=E5=88=B6=E6=96=87=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- def_gen.bat | 6 ++++-- def_gen.sh | 8 +++++--- fs/CMakeLists.txt | 2 +- lua/CMakeLists.txt | 20 ++++++++++---------- lua/xmake.lua | 29 ----------------------------- 5 files changed, 20 insertions(+), 45 deletions(-) delete mode 100644 lua/xmake.lua diff --git a/def_gen.bat b/def_gen.bat index e4c4cbf..7dcc879 100644 --- a/def_gen.bat +++ b/def_gen.bat @@ -2,7 +2,8 @@ setlocal set EXPORT_DIR=export -set MLUA_EXE=%EXPORT_DIR%\mlua.exe +set MLUA_EXE=%EXPORT_DIR%\lua.exe +set MLUAC_EXE=%EXPORT_DIR%\luac.exe set BUILD_BIN=build\bin set GENDEF_EXE=%BUILD_BIN%\gendef.exe set FS_LIB=fs\lib.cxx @@ -10,7 +11,8 @@ set FS_LIB=fs\lib.cxx if not exist %EXPORT_DIR% ( mkdir %EXPORT_DIR% ) -copy /Y %BUILD_BIN%\mlua.exe %MLUA_EXE% +copy /Y %BUILD_BIN%\lua.exe %MLUA_EXE% +copy /Y %BUILD_BIN%\luac.exe %MLUAC_EXE% %GENDEF_EXE% %FS_LIB% lua_fs %EXPORT_DIR% copy /Y %BUILD_BIN%\lua_fs.dll %EXPORT_DIR% echo end! diff --git a/def_gen.sh b/def_gen.sh index 0fdf7ee..8ba4149 100755 --- a/def_gen.sh +++ b/def_gen.sh @@ -3,7 +3,8 @@ set -e # 遇到错误时退出 # 定义路径 EXPORT_DIR="export" -MLUA_EXE="$EXPORT_DIR/mlua" +MLUA_EXE="$EXPORT_DIR/lua" +MLUAC_EXE="$EXPORT_DIR/luac" BUILD_BIN="build/bin" LIB_DIR="build/lib" GENDEF_EXE="$BUILD_BIN/gendef" @@ -12,8 +13,9 @@ FS_LIB="fs/lib.cxx" # 创建 export 和 lua 目录 mkdir -p "$EXPORT_DIR" -# 复制 mlua 可执行文件 -cp -f "$BUILD_BIN/mlua" "$MLUA_EXE" +# 复制 lua 可执行文件 +cp -f "$BUILD_BIN/lua" "$MLUA_EXE" +cp -f "$BUILD_BIN/luac" "$MLUAC_EXE" # 运行 gendef "$GENDEF_EXE" "$FS_LIB" lua_fs "$EXPORT_DIR" diff --git a/fs/CMakeLists.txt b/fs/CMakeLists.txt index dc40de4..b421d89 100644 --- a/fs/CMakeLists.txt +++ b/fs/CMakeLists.txt @@ -8,5 +8,5 @@ if (MSVC) endif() add_library(lua_fs SHARED lib.h lib.cxx) -target_link_libraries(lua_fs PRIVATE lua) +target_link_libraries(lua_fs PRIVATE mlua) target_compile_definitions(lua_fs PRIVATE FS_LIB_EXPORT) \ No newline at end of file diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt index 6a15747..01f3b1e 100644 --- a/lua/CMakeLists.txt +++ b/lua/CMakeLists.txt @@ -27,22 +27,22 @@ list(REMOVE_ITEM LUA_SOURCES ) # Build the static library -add_library(lua STATIC ${LUA_SOURCES}) -target_include_directories(lua PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src) -target_link_libraries(lua PRIVATE ${PLATFORM_LIBS}) -target_compile_definitions(lua PRIVATE LUA_COMPAT_5_3 ${PLATFORM_DEFINITIONS}) -set_target_properties(lua PROPERTIES POSITION_INDEPENDENT_CODE ON) +add_library(mlua STATIC ${LUA_SOURCES}) +target_include_directories(mlua PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src) +target_link_libraries(mlua PRIVATE ${PLATFORM_LIBS}) +target_compile_definitions(mlua PRIVATE LUA_COMPAT_5_3 ${PLATFORM_DEFINITIONS}) +set_target_properties(mlua PROPERTIES POSITION_INDEPENDENT_CODE ON) # 添加Lua可执行文件 -add_executable(mlua src/lua.c) -target_link_libraries(mlua PRIVATE lua) +add_executable(lua src/lua.c) +target_link_libraries(lua PRIVATE mlua) # 添加Lua编译器可执行文件 -add_executable(mluac src/luac.c) -target_link_libraries(mluac PRIVATE lua) +add_executable(luac src/luac.c) +target_link_libraries(luac PRIVATE mlua) # 安装目标 -install(TARGETS lua mlua mluac +install(TARGETS lua mlua luac RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) \ No newline at end of file diff --git a/lua/xmake.lua b/lua/xmake.lua deleted file mode 100644 index 659edf7..0000000 --- a/lua/xmake.lua +++ /dev/null @@ -1,29 +0,0 @@ --- 设置最小版本要求 -set_version("5.4.7") - --- 设置项目语言 -add_rules("mode.debug", "mode.release") - --- 创建静态库 -target("lua") - add_includedirs("src", { public = true }) - set_kind("static") - add_defines("LUA_COMPAT_5_3") - add_files("src/*.c", { exclude = { "src/lua.c", "src/luac.c" } }) - if is_plat("windows") then - add_cflags("/wd4530") - add_defines("LUA_BUILD_AS_DLL") - elseif is_plat("linux") then - add_defines("LUA_USE_LINUX") - add_links("m", "dl", "E") - end - --- 创建Lua可执行文件 -target("mlua") - set_kind("binary") - add_files("src/lua.c") - add_deps("lua") -target("mluac") - set_kind("binary") - add_files("src/luac.c") - add_deps("lua")