Build: added support for unity builds in most projects except for Sto…

…rmLib, ZLib and Scripts
The-Cataclysm-Preservation-Project · Oct 9, 2023 · b49f95e · b49f95e
1 parent 8acfadc
commit b49f95e
Show file tree

Hide file tree

Showing 28 changed files with 219 additions and 6 deletions.
diff --git a/cmake/options.cmake b/cmake/options.cmake
@@ -51,4 +51,4 @@ set(WITH_SOURCE_TREE    "hierarchical" CACHE STRING "Build the source tree for I
 set_property(CACHE WITH_SOURCE_TREE PROPERTY STRINGS no flat hierarchical hierarchical-folders)
 option(WITHOUT_GIT      "Disable the GIT testing routines"                            0)
 option(BUILD_TESTING    "Build test suite" 0)
-
+option(UNITY_BUILDS     "Enables the unity build mode which combines multiple source files into buckets to speed up build time" 0)
diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake
@@ -38,6 +38,12 @@ else()
   message("* Build unit tests       : No (default)")
 endif()
 
+if(UNITY_BUILDS)
+  message("* Unity build enabled    : Yes")
+else()
+  message("* Unity build enabled    : No (default)")
+endif()
+
 if(USE_COREPCH)
   message("* Build core w/PCH       : Yes (default)")
 else()

diff --git a/dep/MinHook/CMakeLists.txt b/dep/MinHook/CMakeLists.txt
@@ -55,3 +55,12 @@ else()
   set_target_properties(minhook PROPERTIES POSTFIX "")
   set_target_properties(minhook PROPERTIES DEBUG_POSTFIX "d")
 endif()
+
+if(UNITY_BUILDS)
+  set_target_properties(minhook
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(minhook
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 2)
+endif()
diff --git a/dep/bzip2/CMakeLists.txt b/dep/bzip2/CMakeLists.txt
@@ -41,3 +41,12 @@ else()
       FOLDER
         "dep")
 endif()
+
+if(UNITY_BUILDS)
+  set_target_properties(bzip2
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(bzip2
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 8)
+endif()
diff --git a/dep/efsw/CMakeLists.txt b/dep/efsw/CMakeLists.txt
@@ -88,3 +88,12 @@ if (BUILD_SHARED_LIBS)
 else ()
   add_library(efsw INTERFACE IMPORTED GLOBAL)
 endif ()
+
+if(UNITY_BUILDS)
+  set_target_properties(efsw
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(efsw
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 8)
+endif()
diff --git a/dep/fmt/CMakeLists.txt b/dep/fmt/CMakeLists.txt
@@ -61,3 +61,12 @@ set_target_properties(fmt
   PROPERTIES
     FOLDER
       "dep")
+
+if(UNITY_BUILDS)
+  set_target_properties(fmt
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(fmt
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 8)
+endif()
diff --git a/dep/g3dlite/CMakeLists.txt b/dep/g3dlite/CMakeLists.txt
@@ -71,3 +71,12 @@ set_target_properties(g3dlib
     PROPERTIES
       FOLDER
         "dep")
+
+if(UNITY_BUILDS)
+  set_target_properties(g3dlib
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(g3dlib
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 8)
+endif()
diff --git a/dep/gsoap/CMakeLists.txt b/dep/gsoap/CMakeLists.txt
@@ -27,6 +27,15 @@ set_target_properties(gsoap
       FOLDER
         "dep")
 
+if(UNITY_BUILDS)
+  set_target_properties(gsoap
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(gsoap
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 7)
+endif()
+
 if (MSVC)
   # Little fix for MSVC / Windows platforms
   target_compile_definitions(gsoap

diff --git a/dep/jemalloc/CMakeLists.txt b/dep/jemalloc/CMakeLists.txt
@@ -117,3 +117,12 @@ else()
       valgrind)
 
 endif()
+
+if(UNITY_BUILDS)
+  set_target_properties(jemalloc
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(jemalloc
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 8)
+endif()
diff --git a/dep/libzmq/CMakeLists.txt b/dep/libzmq/CMakeLists.txt
@@ -217,3 +217,12 @@ target_compile_definitions(libzmq
     -DZMQ_STATIC
     ${ZMQ_PLATFORM}
     ${ADDITIONAL_DEFINES})
+
+if(UNITY_BUILDS)
+  set_target_properties(libzmq
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(libzmq
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 2)
+endif()
diff --git a/dep/recastnavigation/Detour/CMakeLists.txt b/dep/recastnavigation/Detour/CMakeLists.txt
@@ -34,3 +34,12 @@ set_target_properties(Detour
     PROPERTIES
       FOLDER
         "dep")
+
+if(UNITY_BUILDS)
+  set_target_properties(Detour
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(Detour
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 7)
+endif()
diff --git a/dep/recastnavigation/Recast/CMakeLists.txt b/dep/recastnavigation/Recast/CMakeLists.txt
@@ -38,3 +38,12 @@ set_target_properties(Recast
     PROPERTIES
       FOLDER
         "dep")
+
+if(UNITY_BUILDS)
+  set_target_properties(Recast
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(Recast
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 2)
+endif()
diff --git a/dep/zmqpp/CMakeLists.txt b/dep/zmqpp/CMakeLists.txt
@@ -33,3 +33,12 @@ target_compile_definitions(zmqpp
     -DBUILD_VERSION_MINOR=2
     -DBUILD_VERSION_REVISION=0
     -DBUILD_VERSION="3.2.0")
+
+if(UNITY_BUILDS)
+  set_target_properties(zmqpp
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(zmqpp
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 6)
+endif()
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -80,6 +80,15 @@ set_target_properties(common
       FOLDER
         "server")
 
+if(UNITY_BUILDS)
+  set_target_properties(common
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(common
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 4)
+endif()
+
 if(BUILD_SHARED_LIBS)
   if(UNIX)
     install(TARGETS common

diff --git a/src/server/bnetserver/CMakeLists.txt b/src/server/bnetserver/CMakeLists.txt
@@ -70,6 +70,15 @@ set_target_properties(bnetserver
       FOLDER
         "server")
 
+if(UNITY_BUILDS)
+  set_target_properties(bnetserver
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(bnetserver
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 8)
+endif()
+
 if (WIN32)
   if ("${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild")
     add_custom_command(TARGET bnetserver

diff --git a/src/server/database/CMakeLists.txt b/src/server/database/CMakeLists.txt
@@ -75,3 +75,12 @@ endif()
 if(USE_COREPCH)
   add_cxx_pch(database ${PRIVATE_PCH_HEADER})
 endif()
+
+if(UNITY_BUILDS)
+  set_target_properties(database
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(database
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 8)
+endif()
diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
@@ -33,7 +33,7 @@ EndScriptData */
 
 float const MAX_PLAYER_DISTANCE = 100.0f;
 
-enum Points
+enum ScriptedFollowerPoints
 {
     POINT_COMBAT_START  = 0xFFFFFF
 };

diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
@@ -61,6 +61,15 @@ set_target_properties(game
       FOLDER
         "server")
 
+if(UNITY_BUILDS)
+  set_target_properties(game
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(game
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 8)
+endif()
+
 if(BUILD_SHARED_LIBS)
   if(UNIX)
     install(TARGETS game

diff --git a/src/server/game/Warden/WardenMac.cpp b/src/server/game/Warden/WardenMac.cpp
@@ -111,7 +111,7 @@ void WardenMac::RequestHash()
     _session->SendPacket(&pkt);
 }
 
-struct keyData {
+struct keyDataMac {
     union
     {
         struct
@@ -132,7 +132,7 @@ void WardenMac::HandleHashResult(ByteBuffer &buff)
     // test
     int keyIn[4];
 
-    keyData mod_seed = { { { { 0x4D, 0x80, 0x8D, 0x2C, 0x77, 0xD9, 0x05, 0xC4, 0x1A, 0x63, 0x80, 0xEC, 0x08, 0x58, 0x6A, 0xFE } } } };
+    keyDataMac mod_seed = { { { { 0x4D, 0x80, 0x8D, 0x2C, 0x77, 0xD9, 0x05, 0xC4, 0x1A, 0x63, 0x80, 0xEC, 0x08, 0x58, 0x6A, 0xFE } } } };
 
     for (int i = 0; i < 4; ++i)
     {

diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
@@ -55,6 +55,15 @@ set_target_properties(shared
       FOLDER
         "server")
 
+if(UNITY_BUILDS)
+  set_target_properties(shared
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(shared
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 8)
+endif()
+
 if(BUILD_SHARED_LIBS)
   if(UNIX)
     install(TARGETS shared

diff --git a/src/server/shared/DataStores/DBCDatabaseLoader.cpp b/src/server/shared/DataStores/DBCDatabaseLoader.cpp
@@ -50,7 +50,7 @@ DBCDatabaseLoader::DBCDatabaseLoader(std::string const& storageName, std::string
     }
 }
 
-static char const* nullStr = "";
+static char const* dbcNullStr = "";
 
 char* DBCDatabaseLoader::Load(uint32& records, char**& indexTable)
 {
@@ -130,7 +130,7 @@ char* DBCDatabaseLoader::Load(uint32& records, char**& indexTable)
                         offset += 1;
                         break;
                     case FT_STRING:
-                        *reinterpret_cast<char**>(&dataValue[offset]) = const_cast<char*>(nullStr);
+                        *reinterpret_cast<char**>(&dataValue[offset]) = const_cast<char*>(dbcNullStr);
                         offset += sizeof(char*);
                         break;
                 }

diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
@@ -73,6 +73,15 @@ set_target_properties(worldserver
       FOLDER
         "server")
 
+if(UNITY_BUILDS)
+  set_target_properties(worldserver
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(worldserver
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 4)
+endif()
+
 # Add all dynamic projects as dependency to the worldserver
 if(WORLDSERVER_DYNAMIC_SCRIPT_MODULES_DEPENDENCIES)
   add_dependencies(worldserver ${WORLDSERVER_DYNAMIC_SCRIPT_MODULES_DEPENDENCIES})

diff --git a/src/tools/client_launcher/CMakeLists.txt b/src/tools/client_launcher/CMakeLists.txt
@@ -29,4 +29,13 @@ target_link_libraries(${target_name}
     common
 )
 
+if(UNITY_BUILDS)
+  set_target_properties(${target_name}
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(${target_name}
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 8)
+endif()
+
 install(TARGETS ${target_name} DESTINATION "${CMAKE_INSTALL_PREFIX}")
diff --git a/src/tools/client_patcher/CMakeLists.txt b/src/tools/client_patcher/CMakeLists.txt
@@ -28,4 +28,13 @@ target_link_libraries(${target_name}
     minhook
 )
 
+if(UNITY_BUILDS)
+  set_target_properties(${target_name}
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(${target_name}
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 4)
+endif()
+
 install(TARGETS ${target_name} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")
diff --git a/src/tools/connection_patcher/CMakeLists.txt b/src/tools/connection_patcher/CMakeLists.txt
@@ -25,6 +25,15 @@ target_link_libraries(connection_patcher
     common
 )
 
+if(UNITY_BUILDS)
+  set_target_properties(connection_patcher
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(connection_patcher
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 2)
+endif()
+
 if (UNIX)
   install(TARGETS connection_patcher DESTINATION bin)
 elseif (WIN32)

diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
@@ -44,6 +44,15 @@ set_target_properties(mapextractor
     FOLDER
       "tools")
 
+if(UNITY_BUILDS)
+  set_target_properties(mapextractor
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(mapextractor
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 6)
+endif()
+
 if(UNIX)
   install(TARGETS mapextractor DESTINATION bin)
 elseif(WIN32)

diff --git a/src/tools/mmaps_generator/CMakeLists.txt b/src/tools/mmaps_generator/CMakeLists.txt
@@ -42,6 +42,15 @@ set_target_properties(mmaps_generator
       FOLDER
         "tools")
 
+if(UNITY_BUILDS)
+  set_target_properties(mmaps_generator
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(mmaps_generator
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 4)
+endif()
+
 if(UNIX)
   install(TARGETS mmaps_generator DESTINATION bin)
 elseif(WIN32)

diff --git a/src/tools/vmap4_extractor/CMakeLists.txt b/src/tools/vmap4_extractor/CMakeLists.txt
@@ -41,6 +41,15 @@ set_target_properties(vmap4extractor
       FOLDER
         "tools")
 
+if(UNITY_BUILDS)
+  set_target_properties(vmap4extractor
+      PROPERTIES UNITY_BUILD ON)
+  set_target_properties(vmap4extractor
+      PROPERTIES
+        UNITY_BUILD_MODE BATCH
+        UNITY_BUILD_BATCH_SIZE 8)
+endif()
+
 if(UNIX)
   install(TARGETS vmap4extractor DESTINATION bin)
 elseif(WIN32)