pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-10 12:52:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix linking issue

Browse Source
This commit is contained in:
Chris Miles 2025-06-13 02:03:00 -05:00
parent ad8433eba2
commit 0d19c9d5cf
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/CMakeLists.txt
View File

@ -13,7 +13,6 @@ SET(common_sources
crash.cpp crash.cpp
crc16.cpp crc16.cpp
crc32.cpp crc32.cpp
data_bucket.cpp
database/database_dump_service.cpp database/database_dump_service.cpp
database.cpp database.cpp
database_instances.cpp database_instances.cpp
@ -551,7 +550,6 @@ SET(common_headers
cli/eqemu_command_handler.h cli/eqemu_command_handler.h
cli/terminal_color.hpp cli/terminal_color.hpp
cron/croncpp.h cron/croncpp.h
data_bucket.h
database/database_dump_service.h database/database_dump_service.h
data_verification.h data_verification.h
database.h database.h

10
common/data_bucket.cpp
View File

@ -9,7 +9,15 @@ using json = nlohmann::json;
const std::string NESTED_KEY_DELIMITER = "."; const std::string NESTED_KEY_DELIMITER = ".";
std::vector<DataBucketsRepository::DataBuckets> g_data_bucket_cache = {}; std::vector<DataBucketsRepository::DataBuckets> g_data_bucket_cache = {};
extern Database database; #if defined(ZONE)
#include "../zone/zonedb.h"
extern ZoneDatabase database;
#elif defined(WORLD)
#include "../world/worlddb.h"
extern WorldDatabase database;
#else
#error "You must define either ZONE or WORLD"
#endif
void DataBucket::SetData(const std::string &bucket_key, const std::string &bucket_value, std::string expires_time) void DataBucket::SetData(const std::string &bucket_key, const std::string &bucket_value, std::string expires_time)
{ {

2
world/CMakeLists.txt
View File

@ -7,6 +7,7 @@ SET(world_sources
cliententry.cpp cliententry.cpp
clientlist.cpp clientlist.cpp
console.cpp console.cpp
../common/data_bucket.cpp
dynamic_zone.cpp dynamic_zone.cpp
dynamic_zone_manager.cpp dynamic_zone_manager.cpp
eql_config.cpp eql_config.cpp
@ -42,6 +43,7 @@ SET(world_headers
cliententry.h cliententry.h
clientlist.h clientlist.h
console.h console.h
../common/data_bucket.h
dynamic_zone.h dynamic_zone.h
dynamic_zone_manager.h dynamic_zone_manager.h
eql_config.h eql_config.h

2
zone/CMakeLists.txt
View File

@ -25,6 +25,7 @@ SET(zone_sources
combat_record.cpp combat_record.cpp
command.cpp command.cpp
corpse.cpp corpse.cpp
../common/data_bucket.cpp
doors.cpp doors.cpp
dialogue_window.cpp dialogue_window.cpp
dynamic_zone.cpp dynamic_zone.cpp
@ -194,6 +195,7 @@ SET(zone_headers
command.h command.h
common.h common.h
corpse.h corpse.h
../common/data_bucket.h
doors.h doors.h
dialogue_window.h dialogue_window.h
dynamic_zone.h dynamic_zone.h