fix: Dissolve more CMake dependencies (#1387)

* fix: more include changes

* fix: remove dZoneManager from global include

* fix: dDatabase

* fix: dCommon

* fix: object libs

* fix: rebase

* fix: bcrypt

* wip: try simplified connector build

* fix: update dockerfile

* fix: mariadb C/C++ on apple

* feat: Move scripts to CMAKE_MODULE_PATH

* fix: dPropertyBehaviors

* fix: macos?

* fix: Dockerfile

* fix: macos?

* fix: macos?

* fix: macos?

* fix: macos?

* fix: macos?

* try: install_name_tool

* fix not building on unix

* fix include paths

* Remove code changes

Will fix in another PR.

* format pass

remove 2 more included directories.
remove commented out code
add status to messages

* comments and format

surround include directories with quotes
remove commented out code
remove debug messages

* Update CMakeLists.txt

---------

Co-authored-by: David Markowitz <EmosewaMC@gmail.com>
Co-authored-by: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>

CMakeLists.txt

@@ -77,6 +77,7 @@ endif()
 
 # Our output dir
 set(CMAKE_BINARY_DIR ${PROJECT_BINARY_DIR})
+#set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) # unfortunately, forces all libraries to be built in series, which will slow down the build process
 
 # TODO make this not have to override the build type directories
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR})
@@ -90,6 +91,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
+find_package(MariaDB)
+
 # Create a /resServer directory
 make_directory(${CMAKE_BINARY_DIR}/resServer)
 
@@ -202,39 +205,19 @@ foreach(file ${SQL_FILES})
 	configure_file(${CMAKE_SOURCE_DIR}/migrations/cdserver/${file} ${PROJECT_BINARY_DIR}/migrations/cdserver/${file})
 endforeach()
 
+# Add system specfic includes for Apple, Windows and Other Unix OS' (including Linux)
+if (APPLE)
+	include_directories("/usr/local/include/")
+endif()
+
+# Load all of our third party directories
+add_subdirectory(thirdparty)
+
 # Create our list of include directories
 set(INCLUDED_DIRECTORIES
-	"dCommon"
-	"dCommon/dClient"
-	"dCommon/dEnums"
-
-	"dChatFilter"
-
-	"dGame"
-	"dGame/dBehaviors"
-	"dGame/dComponents"
-	"dGame/dGameMessages"
-	"dGame/dInventory"
-	"dGame/dMission"
-	"dGame/dEntity"
-	"dGame/dPropertyBehaviors"
-	"dGame/dPropertyBehaviors/ControlBehaviorMessages"
-	"dGame/dUtilities"
-
 	"dPhysics"
 
 	"dNavigation"
-	"dNavigation/dTerrain"
-
-	"dZoneManager"
-
-	"dDatabase"
-	"dDatabase/CDClientDatabase"
-	"dDatabase/CDClientDatabase/CDClientTables"
-	"dDatabase/GameDatabase"
-	"dDatabase/GameDatabase/ITables"
-	"dDatabase/GameDatabase/MySQL"
-	"dDatabase/GameDatabase/MySQL/Tables"
 
 	"dNet"
 
@@ -254,6 +237,7 @@ set(INCLUDED_DIRECTORIES
 )
 
 # Add system specfic includes for Apple, Windows and Other Unix OS' (including Linux)
+# TODO: Should probably not do this.
 if(APPLE)
 	include_directories("/usr/local/include/")
 endif()
@@ -263,30 +247,10 @@ foreach(dir ${INCLUDED_DIRECTORIES})
 	include_directories(${PROJECT_SOURCE_DIR}/${dir})
 endforeach()
 
-if(NOT WIN32)
-	include_directories("${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/include/bcrypt")
-endif()
-
-include_directories("${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/include")
-
 # Add linking directories:
-link_directories(${PROJECT_BINARY_DIR})
-
-# Load all of our third party directories
-add_subdirectory(thirdparty)
 if (UNIX)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 endif()
-# Glob together all headers that need to be precompiled
-file(
-	GLOB HEADERS_DDATABASE
-	LIST_DIRECTORIES false
-	${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/*.h
-	${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables/*.h
-	${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables/*.h
-	${PROJECT_SOURCE_DIR}/thirdparty/SQLite/*.h
-)
-
 file(
 	GLOB HEADERS_DZONEMANAGER
 	LIST_DIRECTORIES false
@@ -321,7 +285,7 @@ add_subdirectory(dPhysics)
 add_subdirectory(dServer)
 
 # Create a list of common libraries shared between all binaries
-set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "mariadbConnCpp" "magic_enum" "MD5")
+set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "MariaDB::ConnCpp" "magic_enum")
 
 # Add platform specific common libraries
 if(UNIX)
@@ -343,12 +307,6 @@ target_precompile_headers(
 	${HEADERS_DZONEMANAGER}
 )
 
-# Need to specify to use the CXX compiler language here or else we get errors including <string>.
-target_precompile_headers(
-	dDatabase PRIVATE
-	"$<$<COMPILE_LANGUAGE:CXX>:${HEADERS_DDATABASE}>"
-)
-
 target_precompile_headers(
 	dCommon PRIVATE
 	${HEADERS_DCOMMON}

Dockerfile

@@ -23,8 +23,7 @@ RUN --mount=type=cache,id=build-apt-cache,target=/var/cache/apt \
     rm -rf /var/lib/apt/lists/*
 
 # Grab libraries and load them
-COPY --from=build /app/build/mariadbcpp/src/mariadb_connector_cpp-build/libmariadbcpp.so /usr/local/lib/
-COPY --from=build /app/build/mariadbcpp/src/mariadb_connector_cpp-build/libmariadb/libmariadb/libmariadb.so.3 /usr/local/lib
+COPY --from=build /app/build/mariadbcpp/libmariadbcpp.so /usr/local/lib/
 RUN ldconfig
 
 # Server bins

cmake/FindGoogleTest.cmake

@@ -0,0 +1,17 @@
+include(FetchContent)
+
+message(STATUS "Fetching gtest...")
+
+FetchContent_Declare(
+	googletest
+	GIT_REPOSITORY https://github.com/google/googletest.git
+	GIT_TAG release-1.12.1
+)
+
+# For Windows: Prevent overriding the parent project's compiler/linker settings
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+
+FetchContent_MakeAvailable(GoogleTest)
+
+message(STATUS "gtest fetched and is now ready.")
+set(GoogleTest_FOUND TRUE)

cmake/FindMariaDB.cmake

@@ -23,14 +23,14 @@ if(WIN32 AND NOT MARIADB_BUILD_SOURCE)
 	set(MARIADB_CONNECTOR_CPP_MSI "mariadb-connector-cpp-${MARIADB_CONNECTOR_CPP_VERSION}-win64.msi")
 	
 	if(NOT EXISTS "${MARIADB_MSI_DIR}/${MARIADB_CONNECTOR_C_MSI}" )
-		message("Downloading mariadb connector/c")
+		message(STATUS "Downloading mariadb connector/c")
 		file(DOWNLOAD https://dlm.mariadb.com/${MARIADB_CONNECTOR_C_BUCKET}/Connectors/c/connector-c-${MARIADB_CONNECTOR_C_VERSION}/${MARIADB_CONNECTOR_C_MSI}
 			"${MARIADB_MSI_DIR}/${MARIADB_CONNECTOR_C_MSI}"
 			EXPECTED_HASH MD5=${MARIADB_CONNECTOR_C_MD5})
 	endif()
 
 	if(NOT EXISTS "${MARIADB_MSI_DIR}/${MARIADB_CONNECTOR_CPP_MSI}" )
-		message("Downloading mariadb connector/c++")
+		message(STATUS "Downloading mariadb connector/c++")
 		file(DOWNLOAD https://dlm.mariadb.com/${MARIADB_CONNECTOR_CPP_BUCKET}/Connectors/cpp/connector-cpp-${MARIADB_CONNECTOR_CPP_VERSION}/${MARIADB_CONNECTOR_CPP_MSI}
 			"${MARIADB_MSI_DIR}/${MARIADB_CONNECTOR_CPP_MSI}"
 			EXPECTED_HASH MD5=${MARIADB_CONNECTOR_CPP_MD5})
@@ -43,27 +43,28 @@ if(WIN32 AND NOT MARIADB_BUILD_SOURCE)
 		file(TO_NATIVE_PATH "${MARIADB_MSI_DIR}/${MARIADB_CONNECTOR_C_MSI}" MSI_DIR)
 		execute_process(COMMAND msiexec /a ${MSI_DIR} /qn TARGETDIR=${MSIEXEC_TARGETDIR})
 	endif()
+	set(MARIADBC_SHARED_LIBRARY_LOCATION "${MARIADB_C_CONNECTOR_DIR}/lib/libmariadb.dll")
 
 	if(NOT EXISTS "${MARIADB_CPP_CONNECTOR_DIR}")
 	file(TO_NATIVE_PATH "${MARIADB_MSI_DIR}/${MARIADB_CONNECTOR_CPP_MSI}" MSI_DIR)
 		execute_process(COMMAND msiexec /a ${MSI_DIR} /qn TARGETDIR=${MSIEXEC_TARGETDIR})
 	endif()
 
-	set(MARIADB_SHARED_LIBRARY_LOCATION "${MARIADB_CPP_CONNECTOR_DIR}/mariadbcpp.dll")
+	set(MARIADBCPP_SHARED_LIBRARY_LOCATION "${MARIADB_CPP_CONNECTOR_DIR}/mariadbcpp.dll")
 	set(MARIADB_IMPLIB_LOCATION "${MARIADB_CPP_CONNECTOR_DIR}/mariadbcpp.lib")
 	set(MARIADB_INCLUDE_DIR "${MARIADB_CPP_CONNECTOR_DIR}/include/mariadb")
 
 	add_custom_target(mariadb_connector_cpp)
 	add_custom_command(TARGET mariadb_connector_cpp POST_BUILD
 					COMMAND ${CMAKE_COMMAND} -E copy_if_different
-					"${MARIADB_CPP_CONNECTOR_DIR}/mariadbcpp.dll"
-					"${MARIADB_C_CONNECTOR_DIR}/lib/libmariadb.dll"
+					"${MARIADBCPP_SHARED_LIBRARY_LOCATION}"
+					"${MARIADBC_SHARED_LIBRARY_LOCATION}"
 					"${PROJECT_BINARY_DIR}")
 
 	# MariaDB uses plugins that the database needs to load, the prebuilt binaries by default will try to find the libraries in system directories,
 	# so set this define and the servers will set the MARIADB_PLUGIN_DIR environment variable to the appropriate directory.
 	# Plugin directory is determined at dll load time (this will happen before main()) so we need to delay the dll load so that we can set the environment variable
-	add_link_options(/DELAYLOAD:${MARIADB_SHARED_LIBRARY_LOCATION})
+	add_link_options(/DELAYLOAD:${MARIADBCPP_SHARED_LIBRARY_LOCATION})
 	add_compile_definitions(MARIADB_PLUGIN_DIR_OVERRIDE="${MARIADB_CPP_CONNECTOR_DIR}/plugin")
 else() # Build from source
 
@@ -85,77 +86,61 @@ else() # Build from source
 			-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0)
 	endif()
 
+	set(MARIADBCPP_INSTALL_DIR ${PROJECT_BINARY_DIR}/prefix)
+	set(MARIADBCPP_LIBRARY_DIR ${PROJECT_BINARY_DIR}/mariadbcpp)
+	set(MARIADBCPP_PLUGIN_DIR ${MARIADBCPP_LIBRARY_DIR}/plugin)
+	set(MARIADBCPP_SOURCE_DIR ${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp)
+	set(MARIADB_INCLUDE_DIR "${MARIADBCPP_SOURCE_DIR}/include")
 	ExternalProject_Add(mariadb_connector_cpp
-						SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/mariadb-connector-cpp
-						CMAKE_ARGS  -Wno-dev
-									-DCMAKE_BUILD_RPATH_USE_ORIGIN=${CMAKE_BUILD_RPATH_USE_ORIGIN}
-									-DCMAKE_INSTALL_PREFIX=./mariadbcpp # Points the connector to the correct plugin directory
-									-DINSTALL_PLUGINDIR=plugin
-									${MARIADB_EXTRA_CMAKE_ARGS}
-						PREFIX "${PROJECT_BINARY_DIR}/mariadbcpp"
-						BUILD_COMMAND cmake --build . --config RelWithDebInfo -j${MARIADB_CONNECTOR_COMPILE_JOBS}
-						INSTALL_COMMAND "")
-
-	ExternalProject_Get_Property(mariadb_connector_cpp BINARY_DIR)
+		PREFIX "${PROJECT_BINARY_DIR}/thirdparty/mariadb-connector-cpp"
+		SOURCE_DIR ${MARIADBCPP_SOURCE_DIR}
+		INSTALL_DIR ${MARIADBCPP_INSTALL_DIR}
+		CMAKE_ARGS  -Wno-dev
+					-DWITH_UNIT_TESTS=OFF
+					-DMARIADB_LINK_DYNAMIC=OFF
+					-DCMAKE_BUILD_RPATH_USE_ORIGIN=${CMAKE_BUILD_RPATH_USE_ORIGIN}
+					-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+					-DINSTALL_LIBDIR=${MARIADBCPP_LIBRARY_DIR}
+					-DINSTALL_PLUGINDIR=${MARIADBCPP_PLUGIN_DIR}
+					${MARIADB_EXTRA_CMAKE_ARGS}
+		BUILD_ALWAYS true
+	)
 
 	if(WIN32)
 		set(MARIADB_SHARED_LIBRARY_NAME mariadbcpp.dll)
 		set(MARIADB_PLUGIN_SUFFIX .dll)
-		set(MARIADB_IMPLIB_LOCATION "${BINARY_DIR}/RelWithDebInfo/mariadbcpp.lib")
+		set(MARIADB_IMPLIB_LOCATION "${MARIADBCPP_LIBRARY_DIR}/mariadbcpp.lib")
 
 		# When built from source windows only seems to check same folder as exe instead specified folder, so use
 		# environment variable to force it
 		add_link_options(/DELAYLOAD:mariadbcpp.dll)
-		add_compile_definitions(MARIADB_PLUGIN_DIR_OVERRIDE="${PROJECT_BINARY_DIR}/mariadbcpp/plugin")
+		add_compile_definitions(MARIADB_PLUGIN_DIR_OVERRIDE="${MARIADBCPP_PLUGIN_DIR}")
 	else()
 		set(MARIADB_SHARED_LIBRARY_NAME libmariadbcpp${CMAKE_SHARED_LIBRARY_SUFFIX})
-		set(MARIADB_PLUGIN_SUFFIX .so)
+		set(MARIADB_PLUGIN_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
 	endif()
 
-	get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-	if(isMultiConfig)
-		set(MARIADB_SHARED_LIBRARY_LOCATION "${BINARY_DIR}/RelWithDebInfo/${MARIADB_SHARED_LIBRARY_NAME}")
-		set(MARIADB_SHARED_LIBRARY_COPY_LOCATION "${PROJECT_BINARY_DIR}/$<CONFIG>")
-		set(MARIADB_PLUGINS_LOCATION "${BINARY_DIR}/libmariadb/RelWithDebInfo")
-	else()
-		set(MARIADB_SHARED_LIBRARY_LOCATION "${BINARY_DIR}/${MARIADB_SHARED_LIBRARY_NAME}")
-		set(MARIADB_SHARED_LIBRARY_COPY_LOCATION "${PROJECT_BINARY_DIR}")
-		set(MARIADB_PLUGINS_LOCATION "${BINARY_DIR}/libmariadb")
+	set(MARIADBCPP_SHARED_LIBRARY_LOCATION "${MARIADBCPP_LIBRARY_DIR}/${MARIADB_SHARED_LIBRARY_NAME}")
+	if(WIN32)
+		set(MARIADBC_SHARED_LIBRARY_LOCATION "${MARIADBCPP_LIBRARY_DIR}/libmariadb.lib")
 	endif()
-
-	set(MARIADB_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include/")
-
-	add_custom_command(TARGET mariadb_connector_cpp POST_BUILD
-						COMMAND ${CMAKE_COMMAND} -E make_directory
-						${BINARY_DIR}/mariadbcpp/plugin
-						${MARIADB_SHARED_LIBRARY_COPY_LOCATION}
-
-						COMMAND ${CMAKE_COMMAND} -E copy_if_different
-						${MARIADB_SHARED_LIBRARY_LOCATION}
-						${MARIADB_SHARED_LIBRARY_COPY_LOCATION}
-
-						COMMAND ${CMAKE_COMMAND} -E copy_if_different
-						${MARIADB_PLUGINS_LOCATION}/caching_sha2_password${MARIADB_PLUGIN_SUFFIX}
-						${MARIADB_PLUGINS_LOCATION}/client_ed25519${MARIADB_PLUGIN_SUFFIX}
-						${MARIADB_PLUGINS_LOCATION}/dialog${MARIADB_PLUGIN_SUFFIX}
-						${MARIADB_PLUGINS_LOCATION}/mysql_clear_password${MARIADB_PLUGIN_SUFFIX}
-						${MARIADB_PLUGINS_LOCATION}/sha256_password${MARIADB_PLUGIN_SUFFIX}
-						${BINARY_DIR}/mariadbcpp/plugin)
-endif()
-
-# Remove the CMakeLists.txt file from the tests folder for the maria-db-connector so we dont compile the tests.
-if(EXISTS "${CMAKE_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/test/CMakeLists.txt")
-	file(REMOVE "${CMAKE_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/test/CMakeLists.txt")
 endif()
 
 # Create mariadb connector library object
-add_library(mariadbConnCpp SHARED IMPORTED GLOBAL)
-set_property(TARGET mariadbConnCpp PROPERTY IMPORTED_LOCATION ${MARIADB_SHARED_LIBRARY_LOCATION})
+add_library(MariaDB::ConnCpp SHARED IMPORTED GLOBAL)
+add_dependencies(MariaDB::ConnCpp mariadb_connector_cpp)
+set_target_properties(MariaDB::ConnCpp PROPERTIES
+	IMPORTED_LOCATION "${MARIADBCPP_SHARED_LIBRARY_LOCATION}")
 
 if(WIN32)
-	set_property(TARGET mariadbConnCpp PROPERTY IMPORTED_IMPLIB ${MARIADB_IMPLIB_LOCATION})
+	set_target_properties(MariaDB::ConnCpp PROPERTIES
+		IMPORTED_IMPLIB "${MARIADB_IMPLIB_LOCATION}")
+elseif(APPLE)
+	set_target_properties(MariaDB::ConnCpp PROPERTIES
+		IMPORTED_SONAME "libmariadbcpp")
 endif()
 
 # Add directories to include lists
-target_include_directories(mariadbConnCpp INTERFACE ${MARIADB_INCLUDE_DIR})
-add_dependencies(mariadbConnCpp mariadb_connector_cpp)
+target_include_directories(MariaDB::ConnCpp INTERFACE ${MARIADB_INCLUDE_DIR})
+
+set(MariaDB_FOUND TRUE)

dChatServer/CMakeLists.txt

@@ -5,10 +5,12 @@ set(DCHATSERVER_SOURCES
 )
 
 add_executable(ChatServer "ChatServer.cpp")
-add_library(dChatServer ${DCHATSERVER_SOURCES})
-target_include_directories(dChatServer PRIVATE ${PROJECT_SOURCE_DIR}/dServer)
+target_include_directories(ChatServer PRIVATE "${PROJECT_SOURCE_DIR}/dChatFilter")
 add_compile_definitions(ChatServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")
 
+add_library(dChatServer ${DCHATSERVER_SOURCES})
+target_include_directories(dChatServer PRIVATE "${PROJECT_SOURCE_DIR}/dServer")
+
 target_link_libraries(dChatServer ${COMMON_LIBRARIES} dChatFilter)
 target_link_libraries(ChatServer ${COMMON_LIBRARIES} dChatFilter dChatServer dServer)
 

dCommon/CMakeLists.txt

@@ -30,11 +30,15 @@ foreach(file ${DCOMMON_DCLIENT_SOURCES})
 	set(DCOMMON_SOURCES ${DCOMMON_SOURCES} "dClient/${file}")
 endforeach()
 
-include_directories(${PROJECT_SOURCE_DIR}/dCommon/)
-
 add_library(dCommon STATIC ${DCOMMON_SOURCES})
-
-target_link_libraries(dCommon bcrypt dDatabase tinyxml2)
+target_include_directories(dCommon
+	PUBLIC "." "dClient" "dEnums"
+	PRIVATE
+	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase"
+	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
+	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase"
+	"${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include"
+)
 
 if (UNIX)
 	find_package(ZLIB REQUIRED)
@@ -65,4 +69,6 @@ else ()
 	)
 endif ()
 
-target_link_libraries(dCommon ZLIB::ZLIB)
+target_link_libraries(dCommon
+	PRIVATE ZLIB::ZLIB bcrypt tinyxml2
+	INTERFACE dDatabase)

dDatabase/CDClientDatabase/CMakeLists.txt

@@ -9,4 +9,28 @@ foreach(file ${DDATABASE_CDCLIENTDATABASE_CDCLIENTTABLES_SOURCES})
 	set(DDATABASE_CDCLIENTDATABASE_SOURCES ${DDATABASE_CDCLIENTDATABASE_SOURCES} "CDClientTables/${file}")
 endforeach()
 
-set(DDATABASE_CDCLIENTDATABASE_SOURCES ${DDATABASE_CDCLIENTDATABASE_SOURCES} PARENT_SCOPE)
+add_library(dDatabaseCDClient STATIC ${DDATABASE_CDCLIENTDATABASE_SOURCES})
+target_include_directories(dDatabaseCDClient PUBLIC "."
+	"CDClientTables"
+	"${PROJECT_SOURCE_DIR}/dCommon"
+	"${PROJECT_SOURCE_DIR}/dCommon/dEnums"
+)
+target_link_libraries(dDatabaseCDClient PRIVATE sqlite3)
+
+if (${CDCLIENT_CACHE_ALL})
+	add_compile_definitions(dDatabaseCDClient PRIVATE CDCLIENT_CACHE_ALL=${CDCLIENT_CACHE_ALL})
+endif()
+
+file(
+	GLOB HEADERS_DDATABASE_CDCLIENT
+	LIST_DIRECTORIES false
+	${PROJECT_SOURCE_DIR}/thirdparty/SQLite/*.h
+	CDClientTables/*.h
+	*.h
+)
+
+# Need to specify to use the CXX compiler language here or else we get errors including <string>.
+target_precompile_headers(
+	dDatabaseCDClient PRIVATE
+	"$<$<COMPILE_LANGUAGE:CXX>:${HEADERS_DDATABASE_CDCLIENT}>"
+)

dDatabase/CMakeLists.txt

@@ -1,20 +1,7 @@
-set(DDATABASE_SOURCES)
-
 add_subdirectory(CDClientDatabase)
-
-foreach(file ${DDATABASE_CDCLIENTDATABASE_SOURCES})
-	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "CDClientDatabase/${file}")
-endforeach()
-
 add_subdirectory(GameDatabase)
 
-foreach(file ${DDATABASE_GAMEDATABASE_SOURCES})
-	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "GameDatabase/${file}")
-endforeach()
-
-add_library(dDatabase STATIC ${DDATABASE_SOURCES})
-target_link_libraries(dDatabase sqlite3 mariadbConnCpp)
-
-if (${CDCLIENT_CACHE_ALL})
-	add_compile_definitions(dDatabase CDCLIENT_CACHE_ALL=${CDCLIENT_CACHE_ALL})
-endif()
+add_library(dDatabase STATIC "MigrationRunner.cpp")
+target_include_directories(dDatabase PUBLIC ".")
+target_link_libraries(dDatabase
+	PUBLIC dDatabaseCDClient dDatabaseGame)

dDatabase/GameDatabase/CMakeLists.txt

@@ -1,6 +1,5 @@
 set(DDATABASE_GAMEDATABASE_SOURCES
 	"Database.cpp"
-	"MigrationRunner.cpp"
 )
 
 add_subdirectory(MySQL)
@@ -9,4 +8,25 @@ foreach(file ${DDATABSE_DATABSES_MYSQL_SOURCES})
 	set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "MySQL/${file}")
 endforeach()
 
-set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} PARENT_SCOPE)
+add_library(dDatabaseGame STATIC ${DDATABASE_GAMEDATABASE_SOURCES})
+target_include_directories(dDatabaseGame PUBLIC "."
+	"ITables" PRIVATE "MySQL"
+	"${PROJECT_SOURCE_DIR}/dCommon"
+	"${PROJECT_SOURCE_DIR}/dCommon/dEnums"
+)
+target_link_libraries(dDatabaseGame
+	PUBLIC MariaDB::ConnCpp
+	INTERFACE dCommon)
+
+# Glob together all headers that need to be precompiled
+file(
+	GLOB HEADERS_DDATABASE_GAME
+	LIST_DIRECTORIES false
+	ITables/*.h
+)
+
+# Need to specify to use the CXX compiler language here or else we get errors including <string>.
+target_precompile_headers(
+	dDatabaseGame PRIVATE
+	"$<$<COMPILE_LANGUAGE:CXX>:${HEADERS_DDATABASE_GAME}>"
+)

dDatabase/GameDatabase/ITables/IAccounts.h

@@ -3,6 +3,7 @@
 
 #include <cstdint>
 #include <optional>
+#include <string>
 #include <string_view>
 
 enum class eGameMasterLevel : uint8_t;

dGame/CMakeLists.txt

@@ -13,11 +13,25 @@ include_directories(
 	${PROJECT_SOURCE_DIR}/dGame
 )
 
-add_library(dGameBase ${DGAME_SOURCES})
+add_library(dGameBase OBJECT ${DGAME_SOURCES})
 target_precompile_headers(dGameBase PRIVATE ${HEADERS_DGAME})
-target_link_libraries(dGameBase
-	PUBLIC dDatabase dPhysics
-	INTERFACE dComponents dEntity)
+target_include_directories(dGameBase PUBLIC "." "dEntity"
+	PRIVATE "dComponents" "dGameMessages" "dBehaviors" "dMission" "dUtilities" "dInventory"
+	$<TARGET_PROPERTY:dPropertyBehaviors,INTERFACE_INCLUDE_DIRECTORIES>
+	"${PROJECT_SOURCE_DIR}/dCommon"
+	"${PROJECT_SOURCE_DIR}/dCommon/dEnums"
+	"${PROJECT_SOURCE_DIR}/dCommon/dClient"
+	# dDatabase
+	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase"
+	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables"
+	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase"
+	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
+	"${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include"
+	# dPhysics
+	"${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Recast/Include"
+	"${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Detour/Include"
+	"${PROJECT_SOURCE_DIR}/dZoneManager"
+)
 
 add_subdirectory(dBehaviors)
 add_subdirectory(dComponents)
@@ -28,7 +42,26 @@ add_subdirectory(dMission)
 add_subdirectory(dPropertyBehaviors)
 add_subdirectory(dUtilities)
 
-add_library(dGame INTERFACE)
-target_link_libraries(dGame INTERFACE
-	dGameBase dBehaviors dComponents dEntity dGameMessages dInventory dMission dPropertyBehaviors dUtilities dScripts
+add_library(dGame STATIC
+	$<TARGET_OBJECTS:dGameBase>
+	$<TARGET_OBJECTS:dBehaviors>
+	$<TARGET_OBJECTS:dComponents>
+	$<TARGET_OBJECTS:dEntity>
+	$<TARGET_OBJECTS:dGameMessages>
+	$<TARGET_OBJECTS:dInventory>
+	$<TARGET_OBJECTS:dMission>
+	$<TARGET_OBJECTS:dPropertyBehaviors>
+	$<TARGET_OBJECTS:dUtilities>
+)
+target_link_libraries(dGame INTERFACE dNet)
+target_include_directories(dGame INTERFACE
+	$<TARGET_PROPERTY:dGameBase,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dBehaviors,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dComponents,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dEntity,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dGameMessages,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dInventory,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dMission,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dPropertyBehaviors,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dUtilities,INTERFACE_INCLUDE_DIRECTORIES>
 )

dGame/dBehaviors/CMakeLists.txt

@@ -55,7 +55,15 @@ set(DGAME_DBEHAVIORS_SOURCES "AirMovementBehavior.cpp"
 	"VentureVisionBehavior.cpp"
 	"VerifyBehavior.cpp")
 
-add_library(dBehaviors STATIC ${DGAME_DBEHAVIORS_SOURCES})
-target_link_libraries(dBehaviors PUBLIC dPhysics)
-target_include_directories(dBehaviors PUBLIC ".")
+add_library(dBehaviors OBJECT ${DGAME_DBEHAVIORS_SOURCES})
+target_link_libraries(dBehaviors PUBLIC dDatabaseCDClient dPhysics)
+target_include_directories(dBehaviors PUBLIC "."
+	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # via BehaviorContext.h
+	PRIVATE
+	"${PROJECT_SOURCE_DIR}/dGame/dComponents" # direct BuffComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # Preconditions.h via QuickBuildComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager.h, Spawner.h
+	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # via CharacterComponent.h
+	"${PROJECT_SOURCE_DIR}/dZoneManager" # via BasicAttackBehavior.cpp
+)
 target_precompile_headers(dBehaviors REUSE_FROM dGameBase)

dGame/dComponents/CMakeLists.txt

@@ -50,9 +50,32 @@ set(DGAME_DCOMPONENTS_SOURCES
 	"MiniGameControlComponent.cpp"
 )
 
-add_library(dComponents STATIC ${DGAME_DCOMPONENTS_SOURCES})
-target_include_directories(dComponents PRIVATE ${PROJECT_SOURCE_DIR}/dScripts/02_server/Map/General) # PetDigServer.h
+add_library(dComponents OBJECT ${DGAME_DCOMPONENTS_SOURCES})
+target_include_directories(dComponents PUBLIC "."
+	"${PROJECT_SOURCE_DIR}/dGame/dPropertyBehaviors" # via ModelComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dPropertyBehaviors/ControlBehaviorMessages"
+	"${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # via InventoryComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # via InventoryComponent.h
+	PRIVATE
+	"${PROJECT_SOURCE_DIR}/dCommon"
+	"${PROJECT_SOURCE_DIR}/dCommon/dEnums"
+	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase"
+	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables"
+	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase"
+	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
+	"${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include"
+	# dPhysics (via dpWorld.h)
+	"${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Recast/Include"
+	"${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Detour/Include"
+
+	"${PROJECT_SOURCE_DIR}/dScripts/02_server/Map/General" # PetDigServer.h
+	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # direct
+	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # direct Loot.h
+	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager/Spawner.h
+	"${PROJECT_SOURCE_DIR}/dZoneManager" # via BouncerComponent.cpp, ActivityComponent.cpp
+	"${PROJECT_SOURCE_DIR}/dChatFilter" # via PetComponent.cpp
+)
 target_precompile_headers(dComponents REUSE_FROM dGameBase)
-target_link_libraries(dComponents
-	PUBLIC dPhysics dDatabase
-	INTERFACE dUtilities dCommon dBehaviors dChatFilter dMission dInventory)
+
+target_link_libraries(dComponents INTERFACE dBehaviors)

dGame/dEntity/CMakeLists.txt

@@ -2,6 +2,6 @@ set(DGAME_DENTITY_SOURCES
 	"EntityCallbackTimer.cpp"
 	"EntityTimer.cpp")
 
-add_library(dEntity STATIC ${DGAME_DENTITY_SOURCES})
+add_library(dEntity OBJECT ${DGAME_DENTITY_SOURCES})
 target_include_directories(dEntity PUBLIC ".")
 target_precompile_headers(dEntity REUSE_FROM dGameBase)

dGame/dGameMessages/CMakeLists.txt

@@ -4,6 +4,20 @@ set(DGAME_DGAMEMESSAGES_SOURCES
 	"PropertyDataMessage.cpp"
 	"PropertySelectQueryProperty.cpp")
 
-add_library(dGameMessages STATIC ${DGAME_DGAMEMESSAGES_SOURCES})
-target_link_libraries(dGameMessages PUBLIC dDatabase)
+add_library(dGameMessages OBJECT ${DGAME_DGAMEMESSAGES_SOURCES})
+target_link_libraries(dGameMessages
+	PUBLIC dDatabase
+	INTERFACE dGameBase # TradingManager
+)
+target_include_directories(dGameMessages PUBLIC "."
+	PRIVATE
+	"${PROJECT_SOURCE_DIR}/dGame/dComponents" # direct MissionComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # direct SlashCommandHandler.h
+	"${PROJECT_SOURCE_DIR}/dGame/dPropertyBehaviors" # direct ControlBehaviors.h
+	"${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # via InventoryComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # via InventoryComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager/Spawner.h
+	"${PROJECT_SOURCE_DIR}/dZoneManager" # via GameMessages.cpp, GameMessageHandler.cpp
+)
 target_precompile_headers(dGameMessages REUSE_FROM dGameBase)

dGame/dInventory/CMakeLists.txt

@@ -5,11 +5,32 @@ set(DGAME_DINVENTORY_SOURCES
 	"ItemSet.cpp"
 	"ItemSetPassiveAbility.cpp")
 
+add_library(dInventory OBJECT ${DGAME_DINVENTORY_SOURCES})
+target_include_directories(dInventory PUBLIC "."
+	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # Item.h uses Preconditions.h
+	"${PROJECT_SOURCE_DIR}/dCommon/eEnums" # Item.h uses dCommonVars.h
+	PRIVATE
+	"${PROJECT_SOURCE_DIR}/dCommon"
+	"${PROJECT_SOURCE_DIR}/dCommon/dEnums"
+	"${PROJECT_SOURCE_DIR}/dCommon/dClient" # Item.cpp uses AssetManager
+
+	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase"
+	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables"
+
+	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # direct
+	"${PROJECT_SOURCE_DIR}/dGame/dComponents" # direct InventoryComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # via InventoryComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager/Spawner.h
+	"${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h
+	"${PROJECT_SOURCE_DIR}/dZoneManager" # via Item.cpp
+)
+target_precompile_headers(dInventory REUSE_FROM dGameBase)
 # Workaround for compiler bug where the optimized code could result in a memcpy of 0 bytes, even though that isnt possible.
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97185
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 	set_source_files_properties("Item.cpp" PROPERTIES COMPILE_FLAGS "-Wno-stringop-overflow")
 endif()
-
-add_library(dInventory STATIC ${DGAME_DINVENTORY_SOURCES})
-target_precompile_headers(dInventory REUSE_FROM dGameBase)
+# INTERFACE link w/o dependency
+#set_property(TARGET dInventory APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+#	dNet dDatabaseCDClient
+#)

dGame/dMission/CMakeLists.txt

@@ -3,6 +3,16 @@ set(DGAME_DMISSION_SOURCES
 	"MissionPrerequisites.cpp"
 	"MissionTask.cpp")
 
-add_library(dMission STATIC ${DGAME_DMISSION_SOURCES})
+add_library(dMission OBJECT ${DGAME_DMISSION_SOURCES})
 target_link_libraries(dMission PUBLIC dDatabase)
+target_include_directories(dMission PUBLIC "."
+	PRIVATE
+	"${PROJECT_SOURCE_DIR}/dGame/dComponents"
+	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # via CharacterComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # via CharacterComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # via LevelProgressionComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager/Spawner.h
+	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # via InventoryComponent.h
+	"${PROJECT_SOURCE_DIR}/dZoneManager" # via Mission.cpp, MissionTask.cpp
+)
 target_precompile_headers(dMission REUSE_FROM dGameBase)

dGame/dPropertyBehaviors/CMakeLists.txt

@@ -12,5 +12,15 @@ foreach(file ${DGAME_DPROPERTYBEHAVIORS_CONTROLBEHAVIORMESSAGES})
 	set(DGAME_DPROPERTYBEHAVIORS_SOURCES ${DGAME_DPROPERTYBEHAVIORS_SOURCES} "ControlBehaviorMessages/${file}")
 endforeach()
 
-add_library(dPropertyBehaviors STATIC ${DGAME_DPROPERTYBEHAVIORS_SOURCES})
+add_library(dPropertyBehaviors OBJECT ${DGAME_DPROPERTYBEHAVIORS_SOURCES})
+target_link_libraries(dPropertyBehaviors PRIVATE dDatabaseCDClient)
+target_include_directories(dPropertyBehaviors PUBLIC "." "ControlBehaviorMessages"
+	PRIVATE
+	"${PROJECT_SOURCE_DIR}/dCommon/dClient" # ControlBehaviors.cpp uses AssetManager
+	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # ObjectIdManager.h
+	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # GameMessages.h
+	"${PROJECT_SOURCE_DIR}/dGame/dComponents" # ModelComponent.h
+)
 target_precompile_headers(dPropertyBehaviors REUSE_FROM dGameBase)
+
+target_link_libraries(dPropertyBehaviors INTERFACE dComponents)

dGame/dUtilities/CMakeLists.txt

@@ -8,8 +8,18 @@ set(DGAME_DUTILITIES_SOURCES "BrickDatabase.cpp"
 	"SlashCommandHandler.cpp"
 	"VanityUtilities.cpp")
 
-add_library(dUtilities STATIC ${DGAME_DUTILITIES_SOURCES})
+add_library(dUtilities OBJECT ${DGAME_DUTILITIES_SOURCES})
 target_precompile_headers(dUtilities REUSE_FROM dGameBase)
+target_include_directories(dUtilities PUBLIC "."
+	PRIVATE
+	"${PROJECT_SOURCE_DIR}/dGame/dComponents"
+	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # transitive via PossessableComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages"
+	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # transitive via InventoryComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dMission" # transitive via MissionComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # transitive via dZoneManager/Spawner.h
+	"${PROJECT_SOURCE_DIR}/dZoneManager" # Mail.cpp
+)
 target_link_libraries(dUtilities
 	PUBLIC dDatabase dPhysics
 	INTERFACE dZoneManager)

dMasterServer/CMakeLists.txt

@@ -7,10 +7,13 @@ set(DMASTERSERVER_SOURCES
 add_library(dMasterServer ${DMASTERSERVER_SOURCES})
 add_executable(MasterServer "MasterServer.cpp")
 add_compile_definitions(MasterServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")
+target_include_directories(dMasterServer PUBLIC "."
+	"${PROJECT_SOURCE_DIR}/dZoneManager" # InstanceManager.h uses dZMCommon.h
+	${PROJECT_SOURCE_DIR}/dServer/ # BinaryPathFinder.h
+)
 
 target_link_libraries(dMasterServer ${COMMON_LIBRARIES})
-target_link_libraries(MasterServer ${COMMON_LIBRARIES} dMasterServer dServer)
-target_include_directories(dMasterServer PRIVATE ${PROJECT_SOURCE_DIR}/dServer)
+target_link_libraries(MasterServer ${COMMON_LIBRARIES} bcrypt dMasterServer dServer)
 
 if(WIN32)
 	add_dependencies(MasterServer WorldServer AuthServer ChatServer)

dNavigation/CMakeLists.txt

@@ -6,5 +6,12 @@ foreach(file ${DNAVIGATIONS_DTERRAIN_SOURCES})
 	set(DNAVIGATION_SOURCES ${DNAVIGATION_SOURCES} "dTerrain/${file}")
 endforeach()
 
-add_library(dNavigation STATIC ${DNAVIGATION_SOURCES})
-target_link_libraries(dNavigation Detour Recast)
+add_library(dNavigation OBJECT ${DNAVIGATION_SOURCES})
+target_include_directories(dNavigation PUBLIC "."
+	PRIVATE
+	"${PROJECT_SOURCE_DIR}/dZoneManager"
+	"${PROJECT_SOURCE_DIR}/dGame"
+	"${PROJECT_SOURCE_DIR}/dGame/dEntity"
+	"${PROJECT_SOURCE_DIR}/dNavigation/dTerrain" # via dNavMesh.cpp
+)
+target_link_libraries(dNavigation PRIVATE Detour Recast dCommon)

dNet/CMakeLists.txt

@@ -8,5 +8,24 @@ set(DNET_SOURCES "AuthPackets.cpp"
 	"ZoneInstanceManager.cpp")
 
 add_library(dNet STATIC ${DNET_SOURCES})
+target_link_libraries(dNet PRIVATE bcrypt MD5)
+target_include_directories(dNet PRIVATE
+	"${PROJECT_SOURCE_DIR}/dCommon"
+	"${PROJECT_SOURCE_DIR}/dCommon/dEnums"
 
-target_link_libraries(dNet PUBLIC dCommon)
+	"${PROJECT_SOURCE_DIR}/dZoneManager"
+
+	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase"
+	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables"
+	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase"
+	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
+	"${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include"
+
+	"${PROJECT_SOURCE_DIR}/dGame" # UserManager.h
+	"${PROJECT_SOURCE_DIR}/dGame/dComponents"
+	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager
+	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # GameMessages.h
+	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # via PossessableComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # via Item.h
+	"${PROJECT_SOURCE_DIR}/dScripts" # transitive through components
+)

dPhysics/CMakeLists.txt

@@ -7,6 +7,10 @@ set(DPHYSICS_SOURCES "dpCollisionChecks.cpp"
 	"dpWorld.cpp")
 
 add_library(dPhysics STATIC ${DPHYSICS_SOURCES})
+target_include_directories(dPhysics PUBLIC "."
+	"${PROJECT_SOURCE_DIR}/dCommon"
+	"${PROJECT_SOURCE_DIR}/dCommon/dEnums"
+)
 target_link_libraries(dPhysics
 	PUBLIC Recast Detour
-	INTERFACE dNavigation)
+	INTERFACE dNavigation dCommon)

dScripts/02_server/CMakeLists.txt

@@ -30,15 +30,28 @@ endforeach()
 
 add_subdirectory(Pets)
 
-add_library(dScriptsServer STATIC ${DSCRIPTS_SOURCES_02_SERVER})
-target_include_directories(dScriptsServer PUBLIC "."
+add_library(dScriptsServerBase OBJECT ${DSCRIPTS_SOURCES_02_SERVER})
+target_include_directories(dScriptsServerBase PUBLIC "."
 	"DLU"
 	"Equipment"
 	"Minigame"
 	"Minigame/General"
 	"Objects"
-	"Pets")
+)
+target_precompile_headers(dScriptsServerBase REUSE_FROM dScriptsBase)
+
+add_library(dScriptsServer INTERFACE)
+target_sources(dScriptsServer INTERFACE
+	$<TARGET_OBJECTS:dScriptsServerBase>
+	$<TARGET_OBJECTS:dScriptsServerEnemy>
+	$<TARGET_OBJECTS:dScriptsServerPets>
+)
 target_link_libraries(dScriptsServer INTERFACE
-	dScriptsServerEnemy
-	dScriptsServerMap)
-target_precompile_headers(dScriptsServer REUSE_FROM dScriptsBase)
+	dScriptsServerMap
+)
+target_include_directories(dScriptsServer INTERFACE
+	$<TARGET_PROPERTY:dScriptsServerBase,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServerEnemy,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServerMap,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServerPets,INTERFACE_INCLUDE_DIRECTORIES>
+)

dScripts/02_server/Enemy/CMakeLists.txt

@@ -42,7 +42,7 @@ foreach(file ${DSCRIPTS_SOURCES_02_SERVER_ENEMY_WAVES})
 	set(DSCRIPTS_SOURCES_02_SERVER_ENEMY ${DSCRIPTS_SOURCES_02_SERVER_ENEMY} "Waves/${file}")
 endforeach()
 
-add_library(dScriptsServerEnemy STATIC ${DSCRIPTS_SOURCES_02_SERVER_ENEMY})
+add_library(dScriptsServerEnemy OBJECT ${DSCRIPTS_SOURCES_02_SERVER_ENEMY})
 target_link_libraries(dScriptsServerEnemy dScriptsBase)
 target_include_directories(dScriptsServerEnemy PUBLIC "."
 	"AG"

dScripts/02_server/Map/AG/CMakeLists.txt

@@ -14,6 +14,6 @@ set(DSCRIPTS_SOURCES_02_SERVER_MAP_AG
 	"NpcCowboyServer.cpp"
 	"NpcPirateServer.cpp")
 
-add_library(dScriptsServerMapAG ${DSCRIPTS_SOURCES_02_SERVER_MAP_AG})
+add_library(dScriptsServerMapAG OBJECT ${DSCRIPTS_SOURCES_02_SERVER_MAP_AG})
 target_include_directories(dScriptsServerMapAG PUBLIC ".")
 target_precompile_headers(dScriptsServerMapAG REUSE_FROM dScriptsBase)

dScripts/02_server/Map/AG_Spider_Queen/CMakeLists.txt

@@ -2,7 +2,7 @@ set(DSCRIPTS_SOURCES_02_SERVER_MAP_AG_SPIDER_QUEEN
 	"ZoneAgSpiderQueen.cpp"
 	"SpiderBossTreasureChestServer.cpp")
 
-add_library(dScriptsServerMapAGSpiderQueen ${DSCRIPTS_SOURCES_02_SERVER_MAP_AG_SPIDER_QUEEN})
+add_library(dScriptsServerMapAGSpiderQueen OBJECT ${DSCRIPTS_SOURCES_02_SERVER_MAP_AG_SPIDER_QUEEN})
 target_include_directories(dScriptsServerMapAGSpiderQueen PUBLIC ".")
 target_link_libraries(dScriptsServerMapAGSpiderQueen dScriptsServerMapProperty)
 target_precompile_headers(dScriptsServerMapAGSpiderQueen REUSE_FROM dScriptsBase)

dScripts/02_server/Map/AM/CMakeLists.txt

@@ -19,6 +19,6 @@ set(DSCRIPTS_SOURCES_02_SERVER_MAP_AM
 	"WanderingVendor.cpp"
 	)
 
-add_library(dScriptsServerMapAM ${DSCRIPTS_SOURCES_02_SERVER_MAP_AM})
+add_library(dScriptsServerMapAM OBJECT ${DSCRIPTS_SOURCES_02_SERVER_MAP_AM})
 target_include_directories(dScriptsServerMapAM PUBLIC ".")
 target_precompile_headers(dScriptsServerMapAM REUSE_FROM dScriptsBase)

dScripts/02_server/Map/CMakeLists.txt

@@ -13,17 +13,33 @@ add_subdirectory(SS)
 add_subdirectory(VE)
 
 add_library(dScriptsServerMap INTERFACE)
-target_link_libraries(dScriptsServerMap INTERFACE
-	dScriptsServerMapAG
-	dScriptsServerMapAGSpiderQueen
-	dScriptsServerMapAM
-	dScriptsServerMapFV
-	dScriptsServerMapGeneral
-	dScriptsServerMapGF
-	dScriptsServerMapNJHub
-	dScriptsServerMapNS
-	dScriptsServerMapNT
-	dScriptsServerMapPR
-	dScriptsServerMapProperty
-	dScriptsServerMapSS
-	dScriptsServerMapVE)
+target_sources(dScriptsServerMap INTERFACE
+	$<TARGET_OBJECTS:dScriptsServerMapAG>
+	$<TARGET_OBJECTS:dScriptsServerMapAGSpiderQueen>
+	$<TARGET_OBJECTS:dScriptsServerMapAM>
+	$<TARGET_OBJECTS:dScriptsServerMapFV>
+	$<TARGET_OBJECTS:dScriptsServerMapGeneral>
+	$<TARGET_OBJECTS:dScriptsServerMapGF>
+	$<TARGET_OBJECTS:dScriptsServerMapNJHub>
+	$<TARGET_OBJECTS:dScriptsServerMapNS>
+	$<TARGET_OBJECTS:dScriptsServerMapNT>
+	$<TARGET_OBJECTS:dScriptsServerMapPR>
+	$<TARGET_OBJECTS:dScriptsServerMapProperty>
+	$<TARGET_OBJECTS:dScriptsServerMapSS>
+	$<TARGET_OBJECTS:dScriptsServerMapVE>
+)
+target_include_directories(dScriptsServerMap INTERFACE
+	$<TARGET_PROPERTY:dScriptsServerMapAG,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServerMapAGSpiderQueen,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServerMapAM,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServerMapFV,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServerMapGeneral,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServerMapGF,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServerMapNJHub,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServerMapNS,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServerMapNT,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServerMapPR,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServerMapProperty,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServerMapSS,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServerMapVE,INTERFACE_INCLUDE_DIRECTORIES>
+)

dScripts/02_server/Map/FV/CMakeLists.txt

@@ -11,6 +11,6 @@ foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_FV_RACING})
 	set(DSCRIPTS_SOURCES_02_SERVER_MAP_FV ${DSCRIPTS_SOURCES_02_SERVER_MAP_FV} "Racing/${file}")
 endforeach()
 
-add_library(dScriptsServerMapFV ${DSCRIPTS_SOURCES_02_SERVER_MAP_FV})
+add_library(dScriptsServerMapFV OBJECT ${DSCRIPTS_SOURCES_02_SERVER_MAP_FV})
 target_include_directories(dScriptsServerMapFV PUBLIC "." "Racing")
 target_precompile_headers(dScriptsServerMapFV REUSE_FROM dScriptsBase)

dScripts/02_server/Map/GF/CMakeLists.txt

@@ -4,6 +4,6 @@ set(DSCRIPTS_SOURCES_02_SERVER_MAP_GF
 	"MastTeleport.cpp"
 	"SpawnLionServer.cpp")
 
-add_library(dScriptsServerMapGF ${DSCRIPTS_SOURCES_02_SERVER_MAP_GF})
+add_library(dScriptsServerMapGF OBJECT ${DSCRIPTS_SOURCES_02_SERVER_MAP_GF})
 target_include_directories(dScriptsServerMapGF PUBLIC ".")
 target_precompile_headers(dScriptsServerMapGF REUSE_FROM dScriptsBase)

dScripts/02_server/Map/General/CMakeLists.txt

@@ -27,6 +27,6 @@ foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL_NINJAGO})
 	set(DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL ${DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL} "Ninjago/${file}")
 endforeach()
 
-add_library(dScriptsServerMapGeneral ${DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL})
+add_library(dScriptsServerMapGeneral OBJECT ${DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL})
 target_include_directories(dScriptsServerMapGeneral PUBLIC "." "Ninjago")
 target_precompile_headers(dScriptsServerMapGeneral REUSE_FROM dScriptsBase)

dScripts/02_server/Map/NS/CMakeLists.txt

@@ -10,6 +10,6 @@ foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_NS_WAVES})
 	set(DSCRIPTS_SOURCES_02_SERVER_MAP_NS ${DSCRIPTS_SOURCES_02_SERVER_MAP_NS} "Waves/${file}")
 endforeach()
 
-add_library(dScriptsServerMapNS ${DSCRIPTS_SOURCES_02_SERVER_MAP_NS})
+add_library(dScriptsServerMapNS OBJECT ${DSCRIPTS_SOURCES_02_SERVER_MAP_NS})
 target_include_directories(dScriptsServerMapNS PUBLIC "." "Waves")
 target_precompile_headers(dScriptsServerMapNS REUSE_FROM dScriptsBase)

dScripts/02_server/Map/NT/CMakeLists.txt

@@ -27,6 +27,6 @@ set(DSCRIPTS_SOURCES_02_SERVER_MAP_NT
 	"NtBcSubmitServer.cpp"
 	"NtNaomiBreadcrumbServer.cpp")
 
-add_library(dScriptsServerMapNT ${DSCRIPTS_SOURCES_02_SERVER_MAP_NT})
+add_library(dScriptsServerMapNT OBJECT ${DSCRIPTS_SOURCES_02_SERVER_MAP_NT})
 target_include_directories(dScriptsServerMapNT PUBLIC ".")
 target_precompile_headers(dScriptsServerMapNT REUSE_FROM dScriptsBase)

dScripts/02_server/Map/PR/CMakeLists.txt

@@ -3,6 +3,6 @@ set(DSCRIPTS_SOURCES_02_SERVER_MAP_PR
 	"PrSeagullFly.cpp"
 	"SpawnGryphonServer.cpp")
 
-add_library(dScriptsServerMapPR ${DSCRIPTS_SOURCES_02_SERVER_MAP_PR})
+add_library(dScriptsServerMapPR OBJECT ${DSCRIPTS_SOURCES_02_SERVER_MAP_PR})
 target_include_directories(dScriptsServerMapPR PUBLIC ".")
 target_precompile_headers(dScriptsServerMapPR REUSE_FROM dScriptsBase)

dScripts/02_server/Map/Property/CMakeLists.txt

@@ -19,7 +19,7 @@ foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY_NS_MED})
 	set(DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY ${DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY} "NS_Med/${file}")
 endforeach()
 
-add_library(dScriptsServerMapProperty ${DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY})
+add_library(dScriptsServerMapProperty OBJECT ${DSCRIPTS_SOURCES_02_SERVER_MAP_PROPERTY})
 target_precompile_headers(dScriptsServerMapProperty REUSE_FROM dScriptsBase)
 target_include_directories(dScriptsServerMapProperty PUBLIC "."
 	"AG_Med"

dScripts/02_server/Map/SS/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(DSCRIPTS_SOURCES_02_SERVER_MAP_SS 
 	"SsModularBuildServer.cpp")
 
-add_library(dScriptsServerMapSS ${DSCRIPTS_SOURCES_02_SERVER_MAP_SS})
+add_library(dScriptsServerMapSS OBJECT ${DSCRIPTS_SOURCES_02_SERVER_MAP_SS})
 target_include_directories(dScriptsServerMapSS PUBLIC ".")
 target_precompile_headers(dScriptsServerMapSS REUSE_FROM dScriptsBase)

dScripts/02_server/Map/VE/CMakeLists.txt

@@ -3,6 +3,6 @@ set(DSCRIPTS_SOURCES_02_SERVER_MAP_VE
 	"VeEpsilonServer.cpp"
 	"VeBricksampleServer.cpp")
 
-add_library(dScriptsServerMapVE ${DSCRIPTS_SOURCES_02_SERVER_MAP_VE})
+add_library(dScriptsServerMapVE OBJECT ${DSCRIPTS_SOURCES_02_SERVER_MAP_VE})
 target_include_directories(dScriptsServerMapVE PUBLIC ".")
 target_precompile_headers(dScriptsServerMapVE REUSE_FROM dScriptsBase)

dScripts/02_server/Map/njhub/CMakeLists.txt

@@ -28,7 +28,7 @@ foreach(file ${DSCRIPTS_SOURCES_02_SERVER_MAP_NJHUB_BOSS_INSTANCE})
 	set(DSCRIPTS_SOURCES_02_SERVER_MAP_NJHUB ${DSCRIPTS_SOURCES_02_SERVER_MAP_NJHUB} "boss_instance/${file}")
 endforeach()
 
-add_library(dScriptsServerMapNJHub ${DSCRIPTS_SOURCES_02_SERVER_MAP_NJHUB})
+add_library(dScriptsServerMapNJHub OBJECT ${DSCRIPTS_SOURCES_02_SERVER_MAP_NJHUB})
 target_include_directories(dScriptsServerMapNJHub PUBLIC "." "boss_instance")
 target_link_libraries(dScriptsServerMapNJHub
 	dScriptsServerPets 

dScripts/02_server/Pets/CMakeLists.txt

@@ -3,7 +3,7 @@ set(DSCRIPTS_SOURCES_02_SERVER_PETS
 	"PetFromObjectServer.cpp"
 	"DamagingPets.cpp")
 
-add_library(dScriptsServerPets STATIC ${DSCRIPTS_SOURCES_02_SERVER_PETS})
+add_library(dScriptsServerPets OBJECT ${DSCRIPTS_SOURCES_02_SERVER_PETS})
 target_include_directories(dScriptsServerPets PUBLIC ".")
 target_precompile_headers(dScriptsServerPets REUSE_FROM dScriptsBase)
 

dScripts/CMakeLists.txt

@@ -17,18 +17,22 @@ set(DSCRIPTS_SOURCES
 
 link_libraries(dDatabase dPhysics)
 
-add_library(dScriptsBase STATIC ${DSCRIPTS_SOURCES})
-target_include_directories(dScriptsBase PUBLIC .)
-target_link_libraries(dScriptsBase
-	INTERFACE dGameBase)
+add_library(dScriptsBase OBJECT ${DSCRIPTS_SOURCES})
+target_link_libraries(dScriptsBase INTERFACE dGameBase dComponents)
 target_precompile_headers(dScriptsBase PRIVATE ${HEADERS_DGAME})
 
 include_directories(
-	${PROJECT_SOURCE_DIR}/dScripts
-	${PROJECT_SOURCE_DIR}/dGame
+	"${PROJECT_SOURCE_DIR}/dScripts"
+	"${PROJECT_SOURCE_DIR}/dGame"
+	"${PROJECT_SOURCE_DIR}/dGame/dComponents" # e.g. ScriptedActivityComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # e.g. direct ActivityManager
+	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" # e.g. direct ActivityManager
+	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # via dZoneManager.h
+	"${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # viaInventoryComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # via InventoryComponent.h
+	"${PROJECT_SOURCE_DIR}/dZoneManager"
 )
-link_libraries(dScriptsBase)
-# dComponents
 
 add_subdirectory(02_server)
 add_subdirectory(ai)
@@ -37,14 +41,22 @@ add_subdirectory(EquipmentScripts)
 add_subdirectory(EquipmentTriggers)
 add_subdirectory(zone)
 
-add_library(dScripts STATIC "CppScripts.cpp")
+add_library(dScripts STATIC
+	$<TARGET_OBJECTS:dScriptsBase>
+	$<TARGET_OBJECTS:dScriptsClient>
+	$<TARGET_OBJECTS:dScriptsEquipmentScripts>
+	$<TARGET_OBJECTS:dScriptsEquipmentTriggers>
+	$<TARGET_OBJECTS:dScriptsZone>
+	"CppScripts.cpp"
+)
+target_link_libraries(dScripts PRIVATE dScriptsAI dScriptsServer)
+target_include_directories(dScripts PRIVATE
+	$<TARGET_PROPERTY:dScriptsBase,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsServer,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsAI,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsClient,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsEquipmentScripts,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsEquipmentTriggers,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsZone,INTERFACE_INCLUDE_DIRECTORIES>
+)
 target_precompile_headers(dScripts REUSE_FROM dScriptsBase)
-target_include_directories(dScripts PUBLIC ".")
-target_link_libraries(dScripts
-	dScriptsBase
-	dScriptsServer
-	dScriptsAI
-	dScriptsClient
-	dScriptsEquipmentScripts
-	dScriptsEquipmentTriggers
-	dScriptsZone)

dScripts/EquipmentScripts/CMakeLists.txt

@@ -8,6 +8,6 @@ set(DSCRIPTS_SOURCES_EQUIPMENTSCRIPTS
 	"FireFirstSkillonStartup.cpp"
 	"StunImmunity.cpp")
 
-add_library(dScriptsEquipmentScripts STATIC ${DSCRIPTS_SOURCES_EQUIPMENTSCRIPTS})
+add_library(dScriptsEquipmentScripts OBJECT ${DSCRIPTS_SOURCES_EQUIPMENTSCRIPTS})
 target_include_directories(dScriptsEquipmentScripts PUBLIC ".")
 target_precompile_headers(dScriptsEquipmentScripts REUSE_FROM dScriptsBase)

dScripts/EquipmentTriggers/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(DSCRIPTS_SOURCES_EQUIPMENTTRIGGERSSCRIPTS
 	"CoilBackpackBase.cpp")
 
-add_library(dScriptsEquipmentTriggers STATIC ${DSCRIPTS_SOURCES_EQUIPMENTTRIGGERSSCRIPTS})
+add_library(dScriptsEquipmentTriggers OBJECT ${DSCRIPTS_SOURCES_EQUIPMENTTRIGGERSSCRIPTS})
 target_include_directories(dScriptsEquipmentTriggers PUBLIC ".")
 target_precompile_headers(dScriptsEquipmentTriggers REUSE_FROM dScriptsBase)

dScripts/ai/ACT/CMakeLists.txt

@@ -9,6 +9,6 @@ foreach(file ${DSCRIPTS_SOURCES_AI_ACT_FOOTRACE})
 	set(DSCRIPTS_SOURCES_AI_ACT ${DSCRIPTS_SOURCES_AI_ACT} "FootRace/${file}")
 endforeach()
 
-add_library(dScriptsAiAct STATIC ${DSCRIPTS_SOURCES_AI_ACT})
+add_library(dScriptsAiAct OBJECT ${DSCRIPTS_SOURCES_AI_ACT})
 target_include_directories(dScriptsAiAct PUBLIC "." "FootRace")
 target_precompile_headers(dScriptsAiAct REUSE_FROM dScriptsBase)

dScripts/ai/AG/CMakeLists.txt

@@ -16,6 +16,6 @@ set(DSCRIPTS_SOURCES_AI_AG
 	"AgStagePlatforms.cpp"
 	"AgQbWall.cpp")
 
-add_library(dScriptsAiAG STATIC ${DSCRIPTS_SOURCES_AI_AG})
+add_library(dScriptsAiAG OBJECT ${DSCRIPTS_SOURCES_AI_AG})
 target_include_directories(dScriptsAiAG PUBLIC ".")
 target_precompile_headers(dScriptsAiAG REUSE_FROM dScriptsBase)

dScripts/ai/CMakeLists.txt

@@ -15,18 +15,34 @@ add_subdirectory(SPEC)
 add_subdirectory(WILD)
 
 add_library(dScriptsAI INTERFACE)
-target_link_libraries(dScriptsAI INTERFACE
-	dScriptsAiAct
-	dScriptsAiAG
-	dScriptsAiFV
-	dScriptsAiGeneral
-	dScriptsAiGF
-	dScriptsAiMinigame
-	dScriptsAiNP
-	dScriptsAiNS
-	dScriptsAiPets
-	dScriptsAiProperty
-	dScriptsAiRacing
-	dScriptsAiSpec
-	dScriptsAiWild
+target_sources(dScriptsAI INTERFACE
+	$<TARGET_OBJECTS:dScriptsAiAct>
+	$<TARGET_OBJECTS:dScriptsAiAG>
+	$<TARGET_OBJECTS:dScriptsAiFV>
+	$<TARGET_OBJECTS:dScriptsAiGeneral>
+	$<TARGET_OBJECTS:dScriptsAiGF>
+	$<TARGET_OBJECTS:dScriptsAiMinigame>
+	$<TARGET_OBJECTS:dScriptsAiNP>
+	$<TARGET_OBJECTS:dScriptsAiNS>
+	$<TARGET_OBJECTS:dScriptsAiPets>
+	$<TARGET_OBJECTS:dScriptsAiProperty>
+	$<TARGET_OBJECTS:dScriptsAiRacing>
+	$<TARGET_OBJECTS:dScriptsAiSpec>
+	$<TARGET_OBJECTS:dScriptsAiWild>
+)
+
+target_include_directories(dScriptsAI INTERFACE
+	$<TARGET_PROPERTY:dScriptsAiAct,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsAiAG,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsAiFV,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsAiGeneral,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsAiGF,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsAiMinigame,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsAiNP,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsAiNS,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsAiPets,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsAiProperty,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsAiRacing,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsAiSpec,INTERFACE_INCLUDE_DIRECTORIES>
+	$<TARGET_PROPERTY:dScriptsAiWild,INTERFACE_INCLUDE_DIRECTORIES>
 )

dScripts/ai/FV/CMakeLists.txt

@@ -18,7 +18,7 @@ set(DSCRIPTS_SOURCES_AI_FV
 	"FvMaelstromGeyser.cpp"
 	"TriggerGas.cpp")
 
-add_library(dScriptsAiFV STATIC ${DSCRIPTS_SOURCES_AI_FV})
+add_library(dScriptsAiFV OBJECT ${DSCRIPTS_SOURCES_AI_FV})
 target_include_directories(dScriptsAiFV PUBLIC ".")
 target_precompile_headers(dScriptsAiFV REUSE_FROM dScriptsBase)
 

dScripts/ai/GENERAL/CMakeLists.txt

@@ -2,7 +2,7 @@ set(DSCRIPTS_SOURCES_AI_GENERAL
 	"InstanceExitTransferPlayerToLastNonInstance.cpp"
 	"LegoDieRoll.cpp")
 
-add_library(dScriptsAiGeneral STATIC ${DSCRIPTS_SOURCES_AI_GENERAL})
+add_library(dScriptsAiGeneral OBJECT ${DSCRIPTS_SOURCES_AI_GENERAL})
 target_include_directories(dScriptsAiGeneral PUBLIC ".")
 target_precompile_headers(dScriptsAiGeneral REUSE_FROM dScriptsBase)
 

dScripts/ai/GF/CMakeLists.txt

@@ -12,6 +12,6 @@ set(DSCRIPTS_SOURCES_AI_GF
 	"PirateRep.cpp"
 	"GfParrotCrash.cpp")
 
-add_library(dScriptsAiGF STATIC ${DSCRIPTS_SOURCES_AI_GF})
+add_library(dScriptsAiGF OBJECT ${DSCRIPTS_SOURCES_AI_GF})
 target_include_directories(dScriptsAiGF PUBLIC ".")
 target_precompile_headers(dScriptsAiGF REUSE_FROM dScriptsBase)

dScripts/ai/MINIGAME/CMakeLists.txt

@@ -12,6 +12,6 @@ foreach(file ${DSCRIPTS_SOURCES_AI_MINIGAME_OBJECTS})
 	set(DSCRIPTS_SOURCES_AI_MINIGAME ${DSCRIPTS_SOURCES_AI_MINIGAME} "Objects/${file}")
 endforeach()
 
-add_library(dScriptsAiMinigame STATIC ${DSCRIPTS_SOURCES_AI_MINIGAME})
+add_library(dScriptsAiMinigame OBJECT ${DSCRIPTS_SOURCES_AI_MINIGAME})
 target_include_directories(dScriptsAiMinigame PUBLIC "." "Objects" "SG_GF" "SG_GF/SERVER")
 target_precompile_headers(dScriptsAiMinigame REUSE_FROM dScriptsBase)

dScripts/ai/NP/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(DSCRIPTS_SOURCES_AI_NP 
 	"NpcNpSpacemanBob.cpp")
 
-add_library(dScriptsAiNP STATIC ${DSCRIPTS_SOURCES_AI_NP})
+add_library(dScriptsAiNP OBJECT ${DSCRIPTS_SOURCES_AI_NP})
 target_include_directories(dScriptsAiNP PUBLIC ".")
 target_precompile_headers(dScriptsAiNP REUSE_FROM dScriptsBase)

dScripts/ai/NS/CMakeLists.txt

@@ -21,7 +21,7 @@ foreach(file ${DSCRIPTS_SOURCES_AI_NS_WH})
 	set(DSCRIPTS_SOURCES_AI_NS ${DSCRIPTS_SOURCES_AI_NS} "WH/${file}")
 endforeach()
 
-add_library(dScriptsAiNS STATIC ${DSCRIPTS_SOURCES_AI_NS})
+add_library(dScriptsAiNS OBJECT ${DSCRIPTS_SOURCES_AI_NS})
 target_include_directories(dScriptsAiNS PUBLIC "." "NS_PP_01" "WH"
 PRIVATE
 	${PROJECT_SOURCE_DIR}/dScripts/02_server/Map/NS) # NsConcertChoiceBuildManager.h

dScripts/ai/PETS/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(DSCRIPTS_SOURCES_AI_PETS 
 	"HydrantSmashable.cpp")
 
-add_library(dScriptsAiPets STATIC ${DSCRIPTS_SOURCES_AI_PETS})
+add_library(dScriptsAiPets OBJECT ${DSCRIPTS_SOURCES_AI_PETS})
 target_include_directories(dScriptsAiPets PUBLIC "." "NS_PP_01" "WH")
 target_precompile_headers(dScriptsAiPets REUSE_FROM dScriptsBase)

dScripts/ai/PROPERTY/CMakeLists.txt

@@ -8,6 +8,6 @@ foreach(file ${DSCRIPTS_SOURCES_AI_PROPERTY_AG})
 	set(DSCRIPTS_SOURCES_AI_PROPERTY ${DSCRIPTS_SOURCES_AI_PROPERTY} "AG/${file}")
 endforeach()
 
-add_library(dScriptsAiProperty STATIC ${DSCRIPTS_SOURCES_AI_PROPERTY})
+add_library(dScriptsAiProperty OBJECT ${DSCRIPTS_SOURCES_AI_PROPERTY})
 target_include_directories(dScriptsAiProperty PUBLIC "." "AG")
 target_precompile_headers(dScriptsAiProperty REUSE_FROM dScriptsBase)

dScripts/ai/RACING/CMakeLists.txt

@@ -6,6 +6,6 @@ foreach(file ${DSCRIPTS_SOURCES_AI_RACING_OBJECTS})
 	set(DSCRIPTS_SOURCES_AI_RACING ${DSCRIPTS_SOURCES_AI_RACING} "OBJECTS/${file}")
 endforeach()
 
-add_library(dScriptsAiRacing STATIC ${DSCRIPTS_SOURCES_AI_RACING})
+add_library(dScriptsAiRacing OBJECT ${DSCRIPTS_SOURCES_AI_RACING})
 target_include_directories(dScriptsAiRacing PUBLIC "." "OBJECTS")
 target_precompile_headers(dScriptsAiRacing REUSE_FROM dScriptsBase)

dScripts/ai/SPEC/CMakeLists.txt

@@ -3,6 +3,6 @@ set(DSCRIPTS_SOURCES_AI_SPEC
 	"SpecialPowerupSpawner.cpp"
 	"SpecialSpeedBuffSpawner.cpp")
 
-add_library(dScriptsAiSpec STATIC ${DSCRIPTS_SOURCES_AI_SPEC})
+add_library(dScriptsAiSpec OBJECT ${DSCRIPTS_SOURCES_AI_SPEC})
 target_include_directories(dScriptsAiSpec PUBLIC ".")
 target_precompile_headers(dScriptsAiSpec REUSE_FROM dScriptsBase)

dScripts/ai/WILD/CMakeLists.txt

@@ -10,6 +10,6 @@ set(DSCRIPTS_SOURCES_AI_WILD
 	"WildNinjaSensei.cpp"
 	"WildPants.cpp")
 
-add_library(dScriptsAiWild STATIC ${DSCRIPTS_SOURCES_AI_WILD})
+add_library(dScriptsAiWild OBJECT ${DSCRIPTS_SOURCES_AI_WILD})
 target_include_directories(dScriptsAiWild PUBLIC ".")
 target_precompile_headers(dScriptsAiWild REUSE_FROM dScriptsBase)

dScripts/client/CMakeLists.txt

@@ -6,6 +6,6 @@ foreach(file ${DSCRIPTS_SOURCES_CLIENT_AI})
 	set(DSCRIPTS_SOURCES_CLIENT ${DSCRIPTS_SOURCES_CLIENT} "ai/${file}")
 endforeach()
 
-add_library(dScriptsClient STATIC ${DSCRIPTS_SOURCES_CLIENT})
+add_library(dScriptsClient OBJECT ${DSCRIPTS_SOURCES_CLIENT})
 target_include_directories(dScriptsClient PUBLIC "." "ai" "ai/PR")
 target_precompile_headers(dScriptsClient REUSE_FROM dScriptsBase)

dScripts/zone/CMakeLists.txt

@@ -18,7 +18,7 @@ foreach(file ${DSCRIPTS_SOURCES_ZONE_PROPERTY})
 	set(DSCRIPTS_SOURCES_ZONE ${DSCRIPTS_SOURCES_ZONE} "PROPERTY/${file}")
 endforeach()
 
-add_library(dScriptsZone STATIC ${DSCRIPTS_SOURCES_ZONE})
+add_library(dScriptsZone OBJECT ${DSCRIPTS_SOURCES_ZONE})
 target_include_directories(dScriptsZone PUBLIC "."
 	"AG"
 	"LUPs"

dServer/CMakeLists.txt

@@ -4,3 +4,7 @@ set(DSERVER_SOURCES
 add_library(dServer STATIC ${DSERVER_SOURCES})
 
 target_include_directories(dServer PUBLIC ".")
+
+target_include_directories(dServer PRIVATE
+	"${PROJECT_SOURCE_DIR}/dCommon/" # BinaryPathFinder.h
+)

dWorldServer/CMakeLists.txt

@@ -2,11 +2,22 @@ set(DWORLDSERVER_SOURCES
 	"PerformanceManager.cpp"
 )
 
-add_library(dWorldServer ${DWORLDSERVER_SOURCES})
+add_library(dWorldServer OBJECT ${DWORLDSERVER_SOURCES})
+target_link_libraries(dWorldServer PUBLIC dGameBase dCommon)
+
 add_executable(WorldServer "WorldServer.cpp")
+target_include_directories(WorldServer PRIVATE "${PROJECT_SOURCE_DIR}/dChatFilter")
 add_compile_definitions(WorldServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")
 
-target_link_libraries(dWorldServer ${COMMON_LIBRARIES})
-target_link_libraries(WorldServer ${COMMON_LIBRARIES} dChatFilter dGame dZoneManager dPhysics Detour Recast tinyxml2 dWorldServer dNavigation dServer)
-target_include_directories(WorldServer PRIVATE ${PROJECT_SOURCE_DIR}/dServer)
+target_include_directories(WorldServer PRIVATE
+	"${PROJECT_SOURCE_DIR}/dServer" # BinaryPathFinder.h
+)
 
+target_link_libraries(WorldServer ${COMMON_LIBRARIES}
+	dScripts
+	dGameBase
+	dComponents
+	dUtilities
+	dGameMessages
+	dInventory
+	dGame dChatFilter dZoneManager dPhysics Detour Recast tinyxml2 dWorldServer dNavigation dServer)

dZoneManager/CMakeLists.txt

@@ -3,7 +3,20 @@ set(DZONEMANAGER_SOURCES "dZoneManager.cpp"
 	"Spawner.cpp"
 	"Zone.cpp")
 
-add_library(dZoneManager STATIC ${DZONEMANAGER_SOURCES})
+add_library(dZoneManager OBJECT ${DZONEMANAGER_SOURCES})
 target_link_libraries(dZoneManager
-	PUBLIC dPhysics
-	INTERFACE dWorldServer)
+	PRIVATE dDatabaseCDClient
+	PUBLIC dPhysics)
+
+#set_property(TARGET dZoneManager APPEND PROPERTY INTERFACE_LINK_LIBRARIES dWorldServer)
+
+target_include_directories(dZoneManager PUBLIC "."
+	"${PROJECT_SOURCE_DIR}/dGame" # Entity.h
+	"${PROJECT_SOURCE_DIR}/dGame/dEntity" # EntityInfo.h
+	PRIVATE
+	"${PROJECT_SOURCE_DIR}/dGame/dComponents" #InventoryComponent.h
+	"${PROJECT_SOURCE_DIR}/dGame/dInventory" #InventoryComponent.h (transitive)
+	"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" #BehaviorSlot.h
+	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" #GameMessages.h
+	"${PROJECT_SOURCE_DIR}/dGame/dUtilities" #VanityUtilities.h
+)

tests/CMakeLists.txt

@@ -1,20 +1,19 @@
-message (STATUS "Testing is enabled.  Fetching gtest...")
+message (STATUS "Testing is enabled.")
 enable_testing()
 
-include(FetchContent)
-FetchContent_Declare(
-	googletest
-	GIT_REPOSITORY https://github.com/google/googletest.git
-	GIT_TAG release-1.12.1
-)
-
-# For Windows: Prevent overriding the parent project's compiler/linker settings
-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-
-FetchContent_MakeAvailable(GoogleTest)
+find_package(GoogleTest REQUIRED)
 include(GoogleTest)
 
-message(STATUS "gtest fetched and is now ready.")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
+
+if(APPLE)
+	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True)
+	set(CMAKE_BUILD_WITH_INSTALL_RPATH True)
+	set(CMAKE_INSTALL_RPATH "@executable_path")
+endif()
+
+add_custom_target(conncpp_tests
+	${CMAKE_COMMAND} -E copy $<TARGET_FILE:MariaDB::ConnCpp> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 
 # Add the subdirectories
 add_subdirectory(dCommonTests)

tests/dCommonTests/CMakeLists.txt

@@ -17,6 +17,19 @@ list(APPEND DCOMMONTEST_SOURCES ${DENUMS_TESTS})
 
 # Set our executable
 add_executable(dCommonTests ${DCOMMONTEST_SOURCES})
+add_dependencies(dCommonTests conncpp_tests)
+
+# Apple needs some special linkage for the mariadb connector for tests.
+if(APPLE)
+add_custom_command(TARGET dCommonTests POST_BUILD
+	COMMAND otool ARGS -l dCommonTests
+	COMMAND otool ARGS -L dCommonTests
+	COMMAND ls
+	COMMAND otool ARGS -D libmariadbcpp.dylib
+	COMMAND install_name_tool ARGS -change libmariadbcpp.dylib @rpath/libmariadbcpp.dylib dCommonTests
+	COMMAND otool ARGS -L dCommonTests
+	WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+endif()
 
 # Link needed libraries
 target_link_libraries(dCommonTests ${COMMON_LIBRARIES} GTest::gtest_main)

tests/dGameTests/CMakeLists.txt

@@ -12,8 +12,18 @@ file(COPY ${GAMEMESSAGE_TESTBITSTREAMS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 # Add the executable.  Remember to add all tests above this!
 add_executable(dGameTests ${DGAMETEST_SOURCES})
+add_dependencies(dGameTests conncpp_tests)
 
-target_link_libraries(dGameTests ${COMMON_LIBRARIES} GTest::gtest_main dGame dZoneManager dPhysics Detour Recast tinyxml2 dWorldServer dChatFilter dNavigation)
+# Apple needs some special linkage for the mariadb connector for tests.
+if(APPLE)
+add_custom_command(TARGET dGameTests POST_BUILD
+	COMMAND install_name_tool ARGS -change libmariadbcpp.dylib @rpath/libmariadbcpp.dylib dGameTests
+	COMMAND otool ARGS -L dGameTests
+	WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+endif()
+
+target_link_libraries(dGameTests ${COMMON_LIBRARIES} GTest::gtest_main
+	dGame dScripts dPhysics Detour Recast tinyxml2 dWorldServer dZoneManager dChatFilter dNavigation)
 
 # Discover the tests
 gtest_discover_tests(dGameTests)

thirdparty/CMakeLists.txt

@@ -19,7 +19,11 @@ add_library(bcrypt ${SOURCES_LIBBCRYPT})
 # Because we are not using the libbcrypt CMakeLists.txt, we need to include these headers for the library to use.
 # fortunately they are only needed for building the libbcrypt directory and nothing else, so these are marked private.
 
-target_include_directories(bcrypt PRIVATE "libbcrypt/include")
+if(NOT WIN32)
+	target_include_directories(bcrypt PRIVATE "libbcrypt/include/bcrypt")
+endif()
+
+target_include_directories(bcrypt INTERFACE "libbcrypt/include")
 target_include_directories(bcrypt PRIVATE "libbcrypt/src")
 
 # Source code for sqlite
@@ -28,9 +32,6 @@ add_subdirectory(SQLite)
 # Source code for magic_enum
 add_subdirectory(magic_enum)
 
-# MariaDB C++ Connector
-include(CMakeMariaDBLists.txt)
-
 # Create our third party library objects
 add_subdirectory(raknet)
 

thirdparty/mariadb-connector-cpp

@@ -1 +1 @@
-Subproject commit 8641b1453ae3ce5a70f78248a1f7fc20a048cb88
+Subproject commit ef0873998b3f94a4f76a485fb90b14866fbb99d4