pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-01 10:11:37 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix libsodium support (oops). Fix perl support (more oops)

Browse Source
This commit is contained in:
KimLS
2025-12-10 23:58:08 -08:00
parent a7d98c2391
commit aff9fd6de8
6 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/CMakeLists.txt
+4 -3
View File
@@ -660,7 +660,7 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Header Files" FILES ${zo
source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Source Files" FILES ${gm_command_sources})
add_library(gm_commands_zone STATIC ${gm_command_sources})
target_link_libraries(gm_commands_zone PRIVATE cereal::cereal fmt::fmt $<IF:$<TARGET_EXISTS:libuv::uv_a>,libuv::uv_a,libuv::uv> unofficial::libmariadb)
target_link_libraries(gm_commands_zone PRIVATE common)
set_target_properties(gm_commands_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE 32)
add_executable(zone ${zone_sources} ${zone_headers})
@@ -677,14 +677,15 @@ add_definitions(-DZONE)
if(EQEMU_BUILD_LUA)
target_compile_definitions(lua_zone PUBLIC LUA_EQEMU)
target_link_libraries(lua_zone PRIVATE luabind Boost::dynamic_bitset Boost::tuple Boost::foreach common)
target_link_libraries(lua_zone PUBLIC luabind Boost::dynamic_bitset Boost::tuple Boost::foreach common)
if (EQEMU_BUILD_STATIC AND LUA_LIBRARY)
target_link_libraries(zone PRIVATE ${LUA_LIBRARY})
endif()
endif()
if(EQEMU_BUILD_PERL)
target_link_libraries(perl_zone PRIVATE perlbind common ${PERL_LIBRARY_LIBS})
target_compile_definitions(perl_zone PUBLIC EMBPERL EMBPERL_PLUGIN PERLBIND_NO_STRICT_SCALAR_TYPES)
target_link_libraries(perl_zone PUBLIC perlbind common ${PERL_LIBRARY})
if (EQEMU_BUILD_STATIC AND PERL_LIBRARY)
target_link_libraries(zone PRIVATE ${PERL_LIBRARY})
endif()
zone/embparser_api.cpp
+6 -6
View File
@@ -2485,27 +2485,27 @@ std::string Perl__get_rule(const char* rule_name)
std::string Perl__get_data(std::string bucket_key)
{
return DataBucket::GetData(bucket_key);
return DataBucket::GetData(&database, bucket_key);
}
std::string Perl__get_data_expires(std::string bucket_key)
{
return DataBucket::GetDataExpires(bucket_key);
return DataBucket::GetDataExpires(&database, bucket_key);
}
void Perl__set_data(std::string key, std::string value)
{
DataBucket::SetData(key, value);
DataBucket::SetData(&database, key, value);
}
void Perl__set_data(std::string key, std::string value, std::string expires_at)
{
DataBucket::SetData(key, value, expires_at);
DataBucket::SetData(&database, key, value, expires_at);
}
bool Perl__delete_data(std::string bucket_key)
{
return DataBucket::DeleteData(bucket_key);
return DataBucket::DeleteData(&database, bucket_key);
}
bool Perl__IsClassicEnabled()
@@ -3045,7 +3045,7 @@ void Perl__rename(std::string name)
std::string Perl__get_data_remaining(std::string bucket_name)
{
return DataBucket::GetDataRemaining(bucket_name);
return DataBucket::GetDataRemaining(&database, bucket_name);
}
const int Perl__getitemstat(uint32 item_id, std::string identifier)