pch

common/CMakeLists.txt

@@ -787,6 +787,10 @@ INCLUDE_DIRECTORIES(Patches SocketLib StackWalker)
 
 ADD_LIBRARY(common ${common_sources} ${common_headers} ${repositories})
 
+IF(WIN32)
+    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch.h)
+ENDIF(WIN32)
+
 IF (UNIX)
     SET_SOURCE_FILES_PROPERTIES("SocketLib/Mime.cpp" PROPERTY COMPILE_FLAGS -Wno-unused-result)
     SET_SOURCE_FILES_PROPERTIES("patches/sod.cpp" "patches/sof.cpp" "patches/rof.cpp" "patches/rof2.cpp" "patches/uf.cpp" PROPERTIES COMPILE_FLAGS -O0)

common/classes.cpp

@@ -15,7 +15,7 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 	*/
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "../common/global_define.h"
 #include "../common/classes.h"
 #include "data_verification.h"

common/cli/eqemu_command_handler.cpp

@@ -18,7 +18,7 @@
  *
  */
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "eqemu_command_handler.h"
 #include "terminal_color.hpp"
 #include "../platform.h"

common/eqemu_config.h

@@ -22,7 +22,7 @@
 #include "linked_list.h"
 #include "path_manager.h"
 #include <fstream>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 struct LoginConfig {
 	std::string LoginHost;

common/eqemu_logsys.h

@@ -33,7 +33,8 @@
 #endif
 #endif
 
-#include <fmt/format.h>
+#undef FMT_HEADER_ONLY
+#include <fmt/core.h>
 #include "types.h"
  
 namespace Logs {

common/events/player_event_discord_formatter.cpp

@@ -2,7 +2,7 @@
 #include "../repositories/character_data_repository.h"
 #include "../json/json_archive_single_line.h"
 #include <vector>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <cereal/archives/json.hpp>
 #include <cereal/types/vector.hpp>
 

common/expedition_lockout_timer.cpp

@@ -22,6 +22,7 @@
 #include "../common/strings.h"
 #include "../common/rulesys.h"
 #include "../common/util/uuid.h"
+#include <fmt/core.h>
 #include <fmt/format.h>
 
 const char* const DZ_REPLAY_TIMER_NAME = "Replay Timer"; // see December 14, 2016 patch notes

common/file.cpp

@@ -35,7 +35,7 @@
 
 #endif
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <filesystem>
 #include <iostream>
 

common/ip_util.cpp

@@ -19,7 +19,7 @@
  */
 
 #include <cstring>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <csignal>
 #include <vector>
 #include "ip_util.h"

common/net/console_server.cpp

@@ -1,6 +1,6 @@
 #include "console_server.h"
 #include "../strings.h"
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 EQ::Net::ConsoleServer::ConsoleServer(const std::string &addr, int port)
 {

common/net/console_server_connection.cpp

@@ -4,7 +4,7 @@
 #include "../eqemu_logsys.h"
 #include "../servertalk.h"
 #include "../rulesys.h"
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 EQ::Net::ConsoleServerConnection::ConsoleServerConnection(ConsoleServer *parent, std::shared_ptr<TCPConnection> connection)
 {

common/net/daybreak_connection.cpp

@@ -5,7 +5,7 @@
 #include "crc32.h"
 #include "../eqemu_logsys.h"
 #include <zlib.h>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <sstream>
 
 EQ::Net::DaybreakConnectionManager::DaybreakConnectionManager()

common/net/packet.cpp

@@ -1,7 +1,7 @@
 #include "packet.h"
 #include "endian.h"
 #include <cctype>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 void EQ::Net::Packet::PutInt8(size_t offset, int8_t value)
 {

common/net/websocket_server.cpp

@@ -1,7 +1,7 @@
 #include "websocket_server.h"
 #include "../event/event_loop.h"
 #include "../event/timer.h"
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <map>
 #include <unordered_set>
 #include <array>

common/net/websocket_server_connection.cpp

@@ -3,7 +3,7 @@
 #include "../timer.h"
 #include "../util/uuid.h"
 #include <sstream>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 struct EQ::Net::WebsocketServerConnection::Impl {
 	WebsocketServer *parent;

common/pch/pch.h

@@ -0,0 +1,29 @@
+// types
+#include <limits>
+#include <string>
+#include <cctype>
+#include <sstream>
+
+// containers
+#include <iterator>
+#include <set>
+#include <unordered_set>
+#include <map>
+#include <unordered_map>
+#include <list>
+#include <vector>
+
+// utilities
+#include <iostream>
+#include <cassert>
+#include <cmath>
+#include <memory>
+#include <functional>
+#include <algorithm>
+#include <utility>
+#include <tuple>
+#include <fstream>
+#include <cstdio>
+
+// fmt
+#include <fmt/format.h>

common/profanity_manager.h

@@ -22,7 +22,7 @@
 
 #include <string>
 #include <list>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 
 class DBcore;

common/repositories/base/base_character_expedition_lockouts_repository.h

@@ -15,6 +15,7 @@
 #include "../../database.h"
 #include "../../strings.h"
 #include <ctime>
+#include <fmt/format.h>
 
 class BaseCharacterExpeditionLockoutsRepository {
 public:

common/rulesys.cpp

@@ -22,7 +22,7 @@
 #include "strings.h"
 #include <cstdlib>
 #include <cstring>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "../common/repositories/rule_sets_repository.h"
 #include "../common/repositories/rule_values_repository.h"

common/shareddb.cpp

@@ -18,7 +18,7 @@
 
 #include <iostream>
 #include <cstring>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #if defined(_MSC_VER) && _MSC_VER >= 1800
 	#include <algorithm>

common/strings.cpp

@@ -34,7 +34,7 @@
 */
 
 #include "strings.h"
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <algorithm>
 #include <cctype>
 

common/strings.h

@@ -44,7 +44,7 @@
 #include <tuple>
 #include <type_traits>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #ifndef _WIN32
 // this doesn't appear to affect linux-based systems..need feedback for _WIN64
@@ -206,7 +206,7 @@ const std::string NUM_TO_ENGLISH_Y[] = {
 	"Fifty ", "Sixty ", "Seventy ", "Eighty ", "Ninety "
 };
 
-// _WIN32 builds require that #include<fmt/format.h> be included in whatever code file the invocation is made from (no header files)
+// _WIN32 builds require that #include<fmt/core.h> be included in whatever code file the invocation is made from (no header files)
 template<typename T1, typename T2>
 std::vector<std::string> join_pair(
 	const std::string &glue,
@@ -239,7 +239,7 @@ std::vector<std::string> join_pair(
 	return output;
 }
 
-// _WIN32 builds require that #include<fmt/format.h> be included in whatever code file the invocation is made from (no header files)
+// _WIN32 builds require that #include<fmt/core.h> be included in whatever code file the invocation is made from (no header files)
 template<typename T1, typename T2, typename T3, typename T4>
 std::vector<std::string> join_tuple(
 	const std::string &glue,

common/strings_legacy.cpp

@@ -1,6 +1,6 @@
 #include <cstring>
 #include "strings.h"
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <algorithm>
 #include <cctype>
 #include <cinttypes>

common/strings_misc.cpp

@@ -1,6 +1,6 @@
 #include <cstring>
 #include "strings.h"
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <algorithm>
 #include <cctype>
 

common/util/uuid.cpp

@@ -1,7 +1,7 @@
 #include "uuid.h"
 
 #include <ios>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #ifdef _WIN32
 #include <objbase.h>

world/CMakeLists.txt

@@ -78,6 +78,8 @@ ADD_EXECUTABLE(world ${world_sources} ${world_headers})
 
 INSTALL(TARGETS world RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
+TARGET_PRECOMPILE_HEADERS(world PRIVATE ../common/pch/pch.h)
+
 ADD_DEFINITIONS(-DWORLD)
 
 TARGET_LINK_LIBRARIES(world ${SERVER_LIBS})

world/clientlist.cpp

@@ -35,6 +35,7 @@
 #include "wguild_mgr.h"
 #include "../common/zone_store.h"
 #include <set>
+#include <fmt/format.h>
 
 extern WebInterfaceList web_interface;
 

world/console.cpp

@@ -31,7 +31,7 @@
 #include "../common/md5.h"
 #include "eqemu_api_world_data_service.h"
 #include "../common/zone_store.h"
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 extern ClientList      client_list;
 extern ZSList          zoneserver_list;

world/dynamic_zone.cpp

@@ -7,6 +7,7 @@
 #include "zoneserver.h"
 #include "../common/eqemu_logsys.h"
 #include "../common/repositories/instance_list_repository.h"
+#include <fmt/format.h>
 
 extern ClientList client_list;
 extern ZSList zoneserver_list;

world/eqemu_api_world_data_service.cpp

@@ -18,7 +18,7 @@
  *
  */
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "clientlist.h"
 #include "cliententry.h"
 #include "eqemu_api_world_data_service.h"

world/expedition_database.cpp

@@ -23,6 +23,7 @@
 #include "../common/repositories/expeditions_repository.h"
 #include "../common/repositories/expedition_lockouts_repository.h"
 #include "../common/repositories/dynamic_zone_members_repository.h"
+#include <fmt/format.h>
 
 void ExpeditionDatabase::PurgeExpiredExpeditions()
 {

world/shared_task_manager.cpp

@@ -16,6 +16,7 @@
 #include "../common/repositories/completed_shared_task_activity_state_repository.h"
 #include "../common/repositories/shared_task_dynamic_zones_repository.h"
 #include <ctime>
+#include <fmt/format.h>
 
 extern ClientList client_list;
 extern ZSList     zoneserver_list;

world/zonelist.cpp

@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "../common/event_sub.h"
 #include "web_interface.h"
 #include "../common/zone_store.h"
+#include <fmt/format.h>
 
 extern uint32 numzones;
 extern EQ::Random emu_random;

zone/CMakeLists.txt

@@ -204,33 +204,6 @@ SET(zone_headers
     hate_list.h
     heal_rotation.h
     horse.h
-    lua_bot.h
-    lua_bit.h
-    lua_client.h
-    lua_corpse.h
-    lua_door.h
-    lua_encounter.h
-    lua_entity.h
-    lua_entity_list.h
-    lua_expedition.h
-    lua_general.h
-    lua_group.h
-    lua_hate_list.h
-    lua_inventory.h
-    lua_item.h
-    lua_iteminst.h
-    lua_mob.h
-    lua_mod.h
-    lua_npc.h
-    lua_object.h
-    lua_packet.h
-    lua_parser.h
-    lua_parser_events.h
-    lua_ptr.h
-    lua_raid.h
-    lua_spawn.h
-    lua_spell.h
-    lua_stat_bonuses.h
     map.h
     masterentity.h
     merc.h
@@ -280,10 +253,48 @@ SET(zone_headers
     zone_reload.h
     zone_cli.cpp)
 
-ADD_EXECUTABLE(zone ${zone_sources} ${zone_headers})
+SET (lua_headers
+    lua_bot.h
+    lua_bit.h
+    lua_client.h
+    lua_corpse.h
+    lua_door.h
+    lua_encounter.h
+    lua_entity.h
+    lua_entity_list.h
+    lua_expedition.h
+    lua_general.h
+    lua_group.h
+    lua_hate_list.h
+    lua_inventory.h
+    lua_item.h
+    lua_iteminst.h
+    lua_mob.h
+    lua_mod.h
+    lua_npc.h
+    lua_object.h
+    lua_packet.h
+    lua_parser.h
+    lua_parser_events.h
+    lua_ptr.h
+    lua_raid.h
+    lua_spawn.h
+    lua_spell.h
+    lua_stat_bonuses.h
+)
+
+ADD_EXECUTABLE(zone ${zone_sources} ${zone_headers} ${lua_headers})
 
 INSTALL(TARGETS zone RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
+IF(WIN32)
+    TARGET_PRECOMPILE_HEADERS(zone PRIVATE pch.h)
+ENDIF(WIN32)
+
+#TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/types.h ../common/eqemu_logsys.h ../common/eqemu_logsys_log_aliases.h ../common/features.h ../common/global_define.h)
+#TARGET_PRECOMPILE_HEADERS(zone PRIVATE mob.h npc.h corpse.h doors.h bot.h entity.h client.h zone.h)
+#TARGET_PRECOMPILE_HEADERS(zone PRIVATE ${lua_headers})
+
 ADD_DEFINITIONS(-DZONE)
 
 TARGET_LINK_LIBRARIES(zone ${ZONE_LIBS})

zone/bot_command.cpp

@@ -65,7 +65,7 @@
 #include "dialogue_window.h"
 #include "mob.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 extern QueryServ* QServ;
 extern WorldServer worldserver;

zone/bot_database.cpp

@@ -29,7 +29,7 @@
 #include "bot.h"
 #include "client.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 
 bool BotDatabase::LoadBotCommandSettings(std::map<std::string, std::pair<uint8, std::vector<std::string>>> &bot_command_settings)

zone/client.cpp

@@ -69,6 +69,7 @@ extern volatile bool RunLoops;
 #include "../common/events/player_events.h"
 #include "../common/events/player_event_logs.h"
 #include "dialogue_window.h"
+#include <fmt/format.h>
 
 
 extern QueryServ* QServ;

zone/command.cpp

@@ -1,7 +1,7 @@
 #include <string.h>
 #include <algorithm>
 #include <thread>
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "../common/repositories/command_subsettings_repository.h"
 
 #ifdef _WINDOWS

zone/dynamic_zone.cpp

@@ -23,6 +23,7 @@
 #include "expedition.h"
 #include "string_ids.h"
 #include "worldserver.h"
+#include <fmt/format.h>
 
 extern WorldServer worldserver;
 

zone/exp.cpp

@@ -36,6 +36,7 @@
 #include "bot.h"
 #include "../common/events/player_event_logs.h"
 #include "worldserver.h"
+#include <fmt/format.h>
 
 extern WorldServer worldserver;
 

zone/expedition.cpp

@@ -26,6 +26,7 @@
 #include "worldserver.h"
 #include "zonedb.h"
 #include "../common/repositories/expedition_lockouts_repository.h"
+#include <fmt/format.h>
 
 extern WorldServer worldserver;
 extern Zone* zone;

zone/expedition_request.cpp

@@ -25,6 +25,7 @@
 #include "raids.h"
 #include "string_ids.h"
 #include "../common/repositories/character_expedition_lockouts_repository.h"
+#include <fmt/format.h>
 
 constexpr char SystemName[] = "expedition";
 

zone/pathfinder_interface.cpp

@@ -2,7 +2,7 @@
 #include "client.h"
 #include "pathfinder_null.h"
 #include "pathfinder_nav_mesh.h"
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <sys/stat.h>
 
 IPathfinder *IPathfinder::Load(const std::string &zone) {

zone/pch.h

@@ -0,0 +1,55 @@
+// types
+#include <limits>
+#include <string>
+#include <cctype>
+#include <sstream>
+
+// containers
+#include <iterator>
+#include <set>
+#include <unordered_set>
+#include <map>
+#include <unordered_map>
+#include <list>
+#include <vector>
+
+// utilities
+#include <iostream>
+#include <cassert>
+#include <cmath>
+#include <memory>
+#include <functional>
+#include <algorithm>
+#include <utility>
+#include <tuple>
+#include <fstream>
+#include <cstdio>
+
+
+// fmt
+#include <fmt/format.h>
+//# include <fmt/core.h>
+//# define FMT_STRING(s) s
+
+// lua
+//#include "lua.hpp"
+//#include <luabind/luabind.hpp>
+//#include <luabind/object.hpp>
+
+// perl
+//#include <perlbind/perlbind.h>
+
+#include "../common/types.h"
+#include "../common/eqemu_logsys.h"
+#include "../common/eqemu_logsys_log_aliases.h"
+#include "../common/features.h"
+#include "../common/global_define.h"
+
+#include "mob.h"
+#include "npc.h"
+#include "corpse.h"
+#include "doors.h"
+#include "bot.h"
+#include "entity.h"
+#include "client.h"
+#include "zone.h"

zone/spawngroup.cpp

@@ -16,7 +16,7 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "../common/global_define.h"
 #include "../common/types.h"
 

zone/task_client_state.cpp

@@ -15,6 +15,7 @@
 #include "dynamic_zone.h"
 #include "string_ids.h"
 #include "../common/events/player_event_logs.h"
+#include <fmt/format.h>
 
 #define EBON_CRYSTAL 40902
 #define RADIANT_CRYSTAL 40903

zone/tasks.cpp

@@ -9,6 +9,7 @@
 #include "tasks.h"
 #include "zonedb.h"
 #include "../common/repositories/character_task_timers_repository.h"
+#include <fmt/format.h>
 
 extern QueryServ *QServ;
 

zone/zonedb.cpp

@@ -25,7 +25,7 @@
 
 #include <ctime>
 #include <iostream>
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 extern Zone* zone;