normalize includes: shared_memory

This commit is contained in:
brainiac 2025-12-17 09:35:43 -08:00 committed by Alex
parent 91defcad99
commit 2c6d8795f9
6 changed files with 38 additions and 43 deletions

View File

@ -16,6 +16,7 @@ add_executable(shared_memory ${shared_memory_sources} ${shared_memory_headers})
install(TARGETS shared_memory RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS shared_memory RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
target_link_libraries(shared_memory common) target_link_libraries(shared_memory common)
target_include_directories(shared_memory PRIVATE ..)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set_property(TARGET shared_memory PROPERTY FOLDER executables/servers) set_property(TARGET shared_memory PROPERTY FOLDER executables/servers)

View File

@ -17,12 +17,13 @@
*/ */
#include "items.h" #include "items.h"
#include "../common/global_define.h"
#include "../common/shareddb.h" #include "common/eqemu_exception.h"
#include "../common/ipc_mutex.h" #include "common/global_define.h"
#include "../common/memory_mapped_file.h" #include "common/ipc_mutex.h"
#include "../common/eqemu_exception.h" #include "common/item_data.h"
#include "../common/item_data.h" #include "common/memory_mapped_file.h"
#include "common/shareddb.h"
void LoadItems(SharedDatabase *database, const std::string &prefix) { void LoadItems(SharedDatabase *database, const std::string &prefix) {
EQ::IPCMutex mutex("items"); EQ::IPCMutex mutex("items");

View File

@ -16,13 +16,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef __EQEMU_SHARED_MEMORY_ITEMS_H #pragma once
#define __EQEMU_SHARED_MEMORY_ITEMS_H
#include "common/eqemu_config.h"
#include <string> #include <string>
#include "../common/eqemu_config.h"
class SharedDatabase; class SharedDatabase;
void LoadItems(SharedDatabase *database, const std::string &prefix); void LoadItems(SharedDatabase *database, const std::string &prefix);
#endif

View File

@ -16,33 +16,29 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <stdio.h> #include "shared_memory/items.h"
#include "shared_memory/spells.h"
#include "../common/eqemu_logsys.h" #include "common/content/world_content_service.h"
#include "../common/global_define.h" #include "common/crash.h"
#include "../common/shareddb.h" #include "common/eqemu_config.h"
#include "../common/eqemu_config.h" #include "common/eqemu_exception.h"
#include "../common/platform.h" #include "common/eqemu_logsys.h"
#include "../common/crash.h" #include "common/events/player_event_logs.h"
#include "../common/rulesys.h" #include "common/evolving_items.h"
#include "../common/eqemu_exception.h" #include "common/global_define.h"
#include "../common/strings.h" #include "common/path_manager.h"
#include "items.h" #include "common/platform.h"
#include "spells.h" #include "common/rulesys.h"
#include "../common/content/world_content_service.h" #include "common/shareddb.h"
#include "../common/zone_store.h" #include "common/strings.h"
#include "../common/path_manager.h" #include "common/zone_store.h"
#include "../common/events/player_event_logs.h"
#include "../common/evolving_items.h"
#include <cstdio>
#ifdef _WINDOWS #ifdef _WINDOWS
#include <direct.h> #include <direct.h>
#else #else
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <sys/stat.h> #include <sys/stat.h>
inline bool MakeDirectory(const std::string &directory_name) inline bool MakeDirectory(const std::string &directory_name)

View File

@ -17,12 +17,13 @@
*/ */
#include "spells.h" #include "spells.h"
#include "../common/global_define.h"
#include "../common/shareddb.h" #include "common/eqemu_exception.h"
#include "../common/ipc_mutex.h" #include "common/global_define.h"
#include "../common/memory_mapped_file.h" #include "common/ipc_mutex.h"
#include "../common/eqemu_exception.h" #include "common/memory_mapped_file.h"
#include "../common/spdat.h" #include "common/shareddb.h"
#include "common/spdat.h"
void LoadSpells(SharedDatabase *database, const std::string &prefix) { void LoadSpells(SharedDatabase *database, const std::string &prefix) {
EQ::IPCMutex mutex("spells"); EQ::IPCMutex mutex("spells");

View File

@ -16,13 +16,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef __EQEMU_SHARED_MEMORY_SPELLS_H #pragma once
#define __EQEMU_SHARED_MEMORY_SPELLS_H
#include "common/eqemu_config.h"
#include <string> #include <string>
#include "../common/eqemu_config.h"
class SharedDatabase; class SharedDatabase;
void LoadSpells(SharedDatabase *database, const std::string &prefix); void LoadSpells(SharedDatabase *database, const std::string &prefix);
#endif