fix: object libs

2025-11-04 06:32:00 +00:00 · 2024-01-04 02:58:51 +01:00
parent 4586a0ffea
commit d67ac7759b
51 changed files with 251 additions and 115 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -252,7 +252,7 @@ endif()
 include_directories("${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/include")

 # Add linking directories:
-link_directories(${PROJECT_BINARY_DIR})
+# link_directories(${PROJECT_BINARY_DIR})

 file(
 	GLOB HEADERS_DZONEMANAGER
--- a/dGame/CMakeLists.txt
+++ b/dGame/CMakeLists.txt
@@ -13,15 +13,24 @@ 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_include_directories(dGameBase PUBLIC "." "dEntity"
 	PRIVATE "dComponents" "dGameMessages" "dBehaviors" "dMission" "dUtilities" "dInventory"
-	"${PROJECT_SOURCE_DIR}/dZoneManager"	
+	"${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"
 )
-target_link_libraries(dGameBase
-	PUBLIC dDatabase dPhysics
-	INTERFACE dComponents dEntity)

 add_subdirectory(dBehaviors)
 add_subdirectory(dComponents)
@@ -32,7 +41,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>
+)
--- a/dGame/dBehaviors/CMakeLists.txt
+++ b/dGame/dBehaviors/CMakeLists.txt
@@ -56,7 +56,7 @@ set(DGAME_DBEHAVIORS_SOURCES "AirMovementBehavior.cpp"
 	"VentureVisionBehavior.cpp"
 	"VerifyBehavior.cpp")

-add_library(dBehaviors STATIC ${DGAME_DBEHAVIORS_SOURCES})
+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
--- a/dGame/dComponents/CMakeLists.txt
+++ b/dGame/dComponents/CMakeLists.txt
@@ -49,12 +49,23 @@ set(DGAME_DCOMPONENTS_SOURCES
 	"MiniGameControlComponent.cpp"
 )

-add_library(dComponents STATIC ${DGAME_DCOMPONENTS_SOURCES})
+add_library(dComponents OBJECT ${DGAME_DCOMPONENTS_SOURCES})
 target_include_directories(dComponents PUBLIC "."
 	"${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
@@ -62,6 +73,11 @@ target_include_directories(dComponents PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dZoneManager" # via BouncerComponent.cpp, ActivityComponent.cpp
 )
 target_precompile_headers(dComponents REUSE_FROM dGameBase)
-target_link_libraries(dComponents
-	PUBLIC dPhysics dDatabase
-	INTERFACE dUtilities dCommon dBehaviors dChatFilter dMission dInventory)
+
+# INTERFACE link w/o dependency
+#set_property(TARGET dComponents APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+#	dUtilities dCommon dBehaviors dChatFilter dMission dInventory
+#	dPhysics
+#)
+
+target_link_libraries(dComponents INTERFACE dBehaviors)
--- a/dGame/dEntity/CMakeLists.txt
+++ b/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)
--- a/dGame/dGameMessages/CMakeLists.txt
+++ b/dGame/dGameMessages/CMakeLists.txt
@@ -4,7 +4,7 @@ set(DGAME_DGAMEMESSAGES_SOURCES
 	"PropertyDataMessage.cpp"
 	"PropertySelectQueryProperty.cpp")

-add_library(dGameMessages STATIC ${DGAME_DGAMEMESSAGES_SOURCES})
+add_library(dGameMessages OBJECT ${DGAME_DGAMEMESSAGES_SOURCES})
 target_link_libraries(dGameMessages
 	PUBLIC dDatabase
 	INTERFACE dGameBase # TradingManager
--- a/dGame/dInventory/CMakeLists.txt
+++ b/dGame/dInventory/CMakeLists.txt
@@ -5,11 +5,18 @@ set(DGAME_DINVENTORY_SOURCES
 	"ItemSet.cpp"
 	"ItemSetPassiveAbility.cpp")

-add_library(dInventory STATIC ${DGAME_DINVENTORY_SOURCES})
+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
@@ -17,5 +24,9 @@ target_include_directories(dInventory PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h
 	"${PROJECT_SOURCE_DIR}/dZoneManager" # via Item.cpp
 )
-target_link_libraries(dInventory PRIVATE dDatabaseCDClient INTERFACE dNet)
 target_precompile_headers(dInventory REUSE_FROM dGameBase)
+
+# INTERFACE link w/o dependency
+#set_property(TARGET dInventory APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+#	dNet dDatabaseCDClient
+#)
--- a/dGame/dMission/CMakeLists.txt
+++ b/dGame/dMission/CMakeLists.txt
@@ -3,7 +3,7 @@ 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
--- a/dGame/dPropertyBehaviors/CMakeLists.txt
+++ b/dGame/dPropertyBehaviors/CMakeLists.txt
@@ -12,7 +12,7 @@ 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
@@ -21,3 +21,5 @@ target_include_directories(dPropertyBehaviors PUBLIC "." "ControlBehaviorMessage
 	"${PROJECT_SOURCE_DIR}/dGame/dComponents" # ModelComponent.h
 )
 target_precompile_headers(dPropertyBehaviors REUSE_FROM dGameBase)
+
+target_link_libraries(dPropertyBehaviors INTERFACE dComponents)
--- a/dGame/dUtilities/CMakeLists.txt
+++ b/dGame/dUtilities/CMakeLists.txt
@@ -8,7 +8,7 @@ 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
--- a/dNavigation/CMakeLists.txt
+++ b/dNavigation/CMakeLists.txt
@@ -6,6 +6,11 @@ foreach(file ${DNAVIGATIONS_DTERRAIN_SOURCES})
 	set(DNAVIGATION_SOURCES ${DNAVIGATION_SOURCES} "dTerrain/${file}")
 endforeach()

-add_library(dNavigation STATIC ${DNAVIGATION_SOURCES})
-target_link_libraries(dNavigation
-	PRIVATE Detour Recast dZoneManager)
+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"
+)
+target_link_libraries(dNavigation PRIVATE Detour Recast dCommon)
--- a/dNet/CMakeLists.txt
+++ b/dNet/CMakeLists.txt
@@ -9,13 +9,26 @@ set(DNET_SOURCES "AuthPackets.cpp"

 add_library(dNet STATIC ${DNET_SOURCES})
 target_include_directories(dNet PRIVATE
+	${PROJECT_SOURCE_DIR}/dCommon
+	${PROJECT_SOURCE_DIR}/dCommon/dEnums
+
+	${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
 )
-target_link_libraries(dNet
-    PUBLIC dCommon dDatabase
-	PRIVATE dZoneManager)
+
+#set_property(TARGET dNet APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+#	dCommon dDatabase
+#)
--- a/dScripts/02_server/CMakeLists.txt
+++ b/dScripts/02_server/CMakeLists.txt
@@ -30,15 +30,29 @@ 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>
+)
+
--- a/dScripts/02_server/Enemy/CMakeLists.txt
+++ b/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"
--- a/dScripts/02_server/Map/AG/CMakeLists.txt
+++ b/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)
--- a/dScripts/02_server/Map/AG_Spider_Queen/CMakeLists.txt
+++ b/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)
--- a/dScripts/02_server/Map/AM/CMakeLists.txt
+++ b/dScripts/02_server/Map/AM/CMakeLists.txt
@@ -17,6 +17,6 @@ set(DSCRIPTS_SOURCES_02_SERVER_MAP_AM
 	"AmBlueX.cpp"
 	"AmTeapotServer.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)
--- a/dScripts/02_server/Map/CMakeLists.txt
+++ b/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>
+)
--- a/dScripts/02_server/Map/FV/CMakeLists.txt
+++ b/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)
--- a/dScripts/02_server/Map/GF/CMakeLists.txt
+++ b/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)
--- a/dScripts/02_server/Map/General/CMakeLists.txt
+++ b/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)
--- a/dScripts/02_server/Map/NS/CMakeLists.txt
+++ b/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)
--- a/dScripts/02_server/Map/NT/CMakeLists.txt
+++ b/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)
--- a/dScripts/02_server/Map/PR/CMakeLists.txt
+++ b/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)
--- a/dScripts/02_server/Map/Property/CMakeLists.txt
+++ b/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"
--- a/dScripts/02_server/Map/SS/CMakeLists.txt
+++ b/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)
--- a/dScripts/02_server/Map/VE/CMakeLists.txt
+++ b/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)
--- a/dScripts/02_server/Map/njhub/CMakeLists.txt
+++ b/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 
--- a/dScripts/02_server/Pets/CMakeLists.txt
+++ b/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)

--- a/dScripts/CMakeLists.txt
+++ b/dScripts/CMakeLists.txt
@@ -17,9 +17,8 @@ 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(
@@ -34,8 +33,6 @@ include_directories(
 	"${PROJECT_SOURCE_DIR}/dGame/dInventory" # via InventoryComponent.h
 	"${PROJECT_SOURCE_DIR}/dZoneManager"
 )
-link_libraries(dScriptsBase)
-# dComponents

 add_subdirectory(02_server)
 add_subdirectory(ai)
@@ -44,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)
--- a/dScripts/EquipmentScripts/CMakeLists.txt
+++ b/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)
--- a/dScripts/EquipmentTriggers/CMakeLists.txt
+++ b/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)
--- a/dScripts/ai/ACT/CMakeLists.txt
+++ b/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)
--- a/dScripts/ai/AG/CMakeLists.txt
+++ b/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)
--- a/dScripts/ai/CMakeLists.txt
+++ b/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>
 )
--- a/dScripts/ai/FV/CMakeLists.txt
+++ b/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)

--- a/dScripts/ai/GENERAL/CMakeLists.txt
+++ b/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)

--- a/dScripts/ai/GF/CMakeLists.txt
+++ b/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)
--- a/dScripts/ai/MINIGAME/CMakeLists.txt
+++ b/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)
--- a/dScripts/ai/NP/CMakeLists.txt
+++ b/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)
--- a/dScripts/ai/NS/CMakeLists.txt
+++ b/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
--- a/dScripts/ai/PETS/CMakeLists.txt
+++ b/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)
--- a/dScripts/ai/PROPERTY/CMakeLists.txt
+++ b/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)
--- a/dScripts/ai/RACING/CMakeLists.txt
+++ b/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)
--- a/dScripts/ai/SPEC/CMakeLists.txt
+++ b/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)
--- a/dScripts/ai/WILD/CMakeLists.txt
+++ b/dScripts/ai/WILD/CMakeLists.txt
@@ -9,6 +9,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)
--- a/dScripts/client/CMakeLists.txt
+++ b/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)
--- a/dScripts/zone/CMakeLists.txt
+++ b/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"
--- a/dWorldServer/CMakeLists.txt
+++ b/dWorldServer/CMakeLists.txt
@@ -2,10 +2,17 @@ set(DWORLDSERVER_SOURCES
 	"PerformanceManager.cpp"
 )

-add_library(dWorldServer ${DWORLDSERVER_SOURCES})
-target_link_libraries(dWorldServer PRIVATE dGame) # ${COMMON_LIBRARIES}
+add_library(dWorldServer OBJECT ${DWORLDSERVER_SOURCES})
+target_link_libraries(dWorldServer PUBLIC dGameBase dCommon)

 add_executable(WorldServer "WorldServer.cpp")
 add_compile_definitions(WorldServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")

-target_link_libraries(WorldServer ${COMMON_LIBRARIES} dGame dChatFilter dZoneManager dPhysics Detour Recast tinyxml2 dWorldServer dNavigation)
+target_link_libraries(WorldServer ${COMMON_LIBRARIES}
+	dScripts
+	dGameBase
+	dComponents
+	dUtilities
+	dGameMessages
+	dInventory
+	dGame dChatFilter dZoneManager dPhysics Detour Recast tinyxml2 dWorldServer dNavigation)
--- a/dZoneManager/CMakeLists.txt
+++ b/dZoneManager/CMakeLists.txt
@@ -3,11 +3,13 @@ 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
 	PRIVATE dDatabaseCDClient
-	PUBLIC dPhysics
-	INTERFACE dWorldServer)
+	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
--- a/tests/dGameTests/CMakeLists.txt
+++ b/tests/dGameTests/CMakeLists.txt
@@ -13,7 +13,8 @@ file(COPY ${GAMEMESSAGE_TESTBITSTREAMS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 # Add the executable.  Remember to add all tests above this!
 add_executable(dGameTests ${DGAMETEST_SOURCES})

-target_link_libraries(dGameTests ${COMMON_LIBRARIES} GTest::gtest_main dGame dZoneManager dPhysics Detour Recast tinyxml2 dWorldServer dChatFilter dNavigation)
+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)