兼容linux

This commit is contained in:
2024-06-19 17:11:45 +08:00
parent eaeabce061
commit 248d51fffc
2 changed files with 5 additions and 4 deletions

View File

@@ -60,6 +60,7 @@ if(MSVC)
else()
include_directories(${PROJECT_SOURCE_DIR}/3rdparty)
include_directories(/usr/local/include)
include_directories(/opt/lua54/include)
add_definitions(-DfPIC)
endif()
@@ -106,7 +107,7 @@ else()
ylib
leveldb
crypto
lua
/opt/lua54/lib/liblua.a
pthread
sqlite3
dl

View File

@@ -246,7 +246,7 @@ void fastweb::uninstall_module(std::string ini_filepath, std::string name)
}
}
#ifndef _WIN32
if(info.type == "lua")
if(info.type == "/opt/lua54/bin/lua")
{
std::cout<<"正在卸载 `"<<info.name_en<<"` 库"<<std::endl;
auto [code,err] = execute_command("sudo luarocks remove "+info.name_en);
@@ -346,7 +346,7 @@ void fastweb::install_module_linux(fastweb::module_info info)
{
if(exsit_install_software("lua") == false)
if(exsit_install_software("/opt/lua54/bin/lua") == false)
{
std::cout<<"LUA未安装请重新执行fastweb一键构建脚本并确认lua编译安装部分正确执行"<<std::endl;
return;
@@ -426,7 +426,7 @@ void fastweb::install_module_linux(fastweb::module_info info)
return;
}
std::cout<<"正在安装 `"<<info.name_en<<"` 库"<<std::endl;
auto [code,err] = execute_command("sudo luarocks install "+info.name_en+" LUA_INCDIR=/usr/local/include LUA_LIBDIR=/usr/loca/lib/liblua.a");
auto [code,err] = execute_command("sudo luarocks install "+info.name_en+" LUA_INCDIR=/opt/lua54/include LUA_LIBDIR=/opt/lua54/lib");
if(code == 0)
{
std::cout<<"安装成功"<<std::endl;