From b3b228c26c295fee77174b5cbc6e5f87e9fcbb29 Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Wed, 25 Jun 2025 12:26:38 -0500 Subject: [PATCH] [Code] PCH Cleanup (#4952) * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update app-pch.h * Update CMakeLists.txt * Split out pch to zone * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update windows-build.ps1 * Update windows-build.ps1 * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt * Update CMakeLists.txt --- common/pch/app-pch.h | 2 ++ zone/CMakeLists.txt | 9 +++------ zone/pch/pch.h | 11 +++++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 zone/pch/pch.h diff --git a/common/pch/app-pch.h b/common/pch/app-pch.h index 6c1f216aa..aa2244f13 100644 --- a/common/pch/app-pch.h +++ b/common/pch/app-pch.h @@ -1,3 +1,5 @@ +#pragma once + #include "../types.h" #include "../database.h" #include "../strings.h" diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt index ecc9d35a8..07ac97cdc 100644 --- a/zone/CMakeLists.txt +++ b/zone/CMakeLists.txt @@ -481,14 +481,11 @@ ADD_EXECUTABLE(zone ${zone_sources} ${zone_headers}) INSTALL(TARGETS zone RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) # precompiled headers -IF (WIN32 AND EQEMU_BUILD_PCH) - TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/pch/std-pch.h) +IF (EQEMU_BUILD_PCH) + TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/pch/app-pch.h) + TARGET_PRECOMPILE_HEADERS(zone PRIVATE ./pch/pch.h) ENDIF() -# precompiled headers -TARGET_PRECOMPILE_HEADERS(zone PRIVATE ../common/pch/app-pch.h) -TARGET_PRECOMPILE_HEADERS(zone PRIVATE merc.h mob.h npc.h corpse.h doors.h bot.h entity.h client.h zone.h) - ADD_DEFINITIONS(-DZONE) # link lua_zone unity build against luabind diff --git a/zone/pch/pch.h b/zone/pch/pch.h new file mode 100644 index 000000000..a34b69021 --- /dev/null +++ b/zone/pch/pch.h @@ -0,0 +1,11 @@ +#pragma once + +#include "../merc.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" \ No newline at end of file