Clean up common_defines
This commit is contained in:
parent
6ee4389b57
commit
101c1217b2
@ -35,7 +35,7 @@
|
|||||||
#include "../common/ConfigReader.h"
|
#include "../common/ConfigReader.h"
|
||||||
#include "../common/Log.h"
|
#include "../common/Log.h"
|
||||||
#include "../common/JsonParser.h"
|
#include "../common/JsonParser.h"
|
||||||
#include "../common/Common_Defines.h"
|
#include "../common/defines.h"
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#define snprintf _snprintf
|
#define snprintf _snprintf
|
||||||
|
@ -44,9 +44,8 @@ using namespace std;
|
|||||||
#include "../common/version.h"
|
#include "../common/version.h"
|
||||||
#include "../common/EQEMuError.h"
|
#include "../common/EQEMuError.h"
|
||||||
#include "../common/opcodemgr.h"
|
#include "../common/opcodemgr.h"
|
||||||
#include "../common/Common_Defines.h"
|
#include "../common/defines.h"
|
||||||
#include "../common/JsonParser.h"
|
#include "../common/JsonParser.h"
|
||||||
#include "../common/Common_Defines.h"
|
|
||||||
|
|
||||||
#include "LoginServer.h"
|
#include "LoginServer.h"
|
||||||
#include "Commands/Commands.h"
|
#include "Commands/Commands.h"
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
// Copyright (C) 2007-2025 EQ2EMulator
|
|
||||||
// Licensed under GPL v3
|
|
||||||
#define BASEDIR "./"
|
|
||||||
|
|
||||||
#ifndef DB_INI_FILE
|
|
||||||
#ifdef LOGIN
|
|
||||||
#define DB_INI_FILE BASEDIR "login_db.ini"
|
|
||||||
#else
|
|
||||||
#define DB_INI_FILE BASEDIR "world_db.ini"
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef MAIN_CONFIG_FILE
|
|
||||||
#define MAIN_CONFIG_FILE BASEDIR "server_config.json"
|
|
||||||
#endif
|
|
16
source/common/defines.h
Normal file
16
source/common/defines.h
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
// Copyright (C) 2007-2025 EQ2EMulator
|
||||||
|
// Licensed under GPL v3
|
||||||
|
|
||||||
|
#define BASEDIR "./"
|
||||||
|
|
||||||
|
#ifndef DB_INI_FILE
|
||||||
|
#ifdef LOGIN
|
||||||
|
#define DB_INI_FILE BASEDIR "login_db.ini"
|
||||||
|
#else
|
||||||
|
#define DB_INI_FILE BASEDIR "world_db.ini"
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef MAIN_CONFIG_FILE
|
||||||
|
#define MAIN_CONFIG_FILE BASEDIR "server_config.json"
|
||||||
|
#endif
|
Loading…
x
Reference in New Issue
Block a user