From 5a506c33da1228b6ec086acb9466cc8279da4d57 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sun, 2 Oct 2016 07:23:07 +0000 Subject: [PATCH] add some templates that weren't in our CMakeLists.txt files --- .../server/library/serverGame/src/CMakeLists.txt | 14 +++++++++++--- .../ServerMissionBoardObjectTemplate.cpp | 1 + .../ServerMissionDataObjectTemplate.cpp | 1 + .../ServerMissionListEntryObjectTemplate.cpp | 1 + .../objectTemplate/ServerTokenObjectTemplate.cpp | 1 + .../shared/library/sharedGame/src/CMakeLists.txt | 16 +++++++++------- .../SharedMissionDataObjectTemplate.cpp | 1 + .../SharedMissionListEntryObjectTemplate.cpp | 1 + .../objectTemplate/SharedTokenObjectTemplate.cpp | 1 + .../library/sharedTemplate/src/CMakeLists.txt | 16 +++++++++++++--- 10 files changed, 40 insertions(+), 13 deletions(-) diff --git a/engine/server/library/serverGame/src/CMakeLists.txt b/engine/server/library/serverGame/src/CMakeLists.txt index 804d16db..98fb2c19 100644 --- a/engine/server/library/serverGame/src/CMakeLists.txt +++ b/engine/server/library/serverGame/src/CMakeLists.txt @@ -543,16 +543,22 @@ set(SHARED_SOURCES shared/objectTemplate/ServerManufactureInstallationObjectTemplate.h shared/objectTemplate/ServerManufactureSchematicObjectTemplate.cpp shared/objectTemplate/ServerManufactureSchematicObjectTemplate.h + shared/objectTemplate/ServerMissionBoardObjectTemplate.cpp + shared/objectTemplate/ServerMissionBoardObjectTemplate.h + shared/objectTemplate/ServerMissionDataObjectTemplate.cpp + shared/objectTemplate/ServerMissionDataObjectTemplate.h + shared/objectTemplate/ServerMissionListEntryObjectTemplate.cpp + shared/objectTemplate/ServerMissionListEntryObjectTemplate.h shared/objectTemplate/ServerMissionObjectTemplate.cpp shared/objectTemplate/ServerMissionObjectTemplate.h shared/objectTemplate/ServerObjectTemplate.cpp shared/objectTemplate/ServerObjectTemplate.h shared/objectTemplate/ServerPlanetObjectTemplate.cpp shared/objectTemplate/ServerPlanetObjectTemplate.h - shared/objectTemplate/ServerPlayerQuestObjectTemplate.h - shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp shared/objectTemplate/ServerPlayerObjectTemplate.cpp shared/objectTemplate/ServerPlayerObjectTemplate.h + shared/objectTemplate/ServerPlayerQuestObjectTemplate.cpp + shared/objectTemplate/ServerPlayerQuestObjectTemplate.h shared/objectTemplate/ServerResourceContainerObjectTemplate.cpp shared/objectTemplate/ServerResourceContainerObjectTemplate.h shared/objectTemplate/ServerSharedObjectTemplateInterface.cpp @@ -563,6 +569,8 @@ set(SHARED_SOURCES shared/objectTemplate/ServerStaticObjectTemplate.h shared/objectTemplate/ServerTangibleObjectTemplate.cpp shared/objectTemplate/ServerTangibleObjectTemplate.h + shared/objectTemplate/ServerTokenObjectTemplate.cpp + shared/objectTemplate/ServerTokenObjectTemplate.h shared/objectTemplate/ServerUniverseObjectTemplate.cpp shared/objectTemplate/ServerUniverseObjectTemplate.h shared/objectTemplate/ServerVehicleObjectTemplate.cpp @@ -570,7 +578,7 @@ set(SHARED_SOURCES shared/objectTemplate/ServerWeaponObjectTemplate.cpp shared/objectTemplate/ServerWeaponObjectTemplate.h shared/objectTemplate/ServerXpManagerObjectTemplate.cpp - shared/objectTemplate/ServerXpManagerObjectTemplate.h + shared/objectTemplate/ServerXpManagerObjectTemplate.h shared/pvp/Pvp.cpp shared/pvp/PvpFactions.cpp diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionBoardObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionBoardObjectTemplate.cpp index 56003cf7..f37c4bc1 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionBoardObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionBoardObjectTemplate.cpp @@ -16,6 +16,7 @@ #include "sharedFile/Iff.h" #include "sharedObject/ObjectTemplate.h" #include "sharedObject/ObjectTemplateList.h" +#include "sharedMath/Vector.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS #include diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionDataObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionDataObjectTemplate.cpp index ec08cd75..b594ed79 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionDataObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionDataObjectTemplate.cpp @@ -16,6 +16,7 @@ #include "sharedFile/Iff.h" #include "sharedObject/ObjectTemplate.h" #include "sharedObject/ObjectTemplateList.h" +#include "sharedMath/Vector.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS #include diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionListEntryObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionListEntryObjectTemplate.cpp index 25430531..1979ebb7 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionListEntryObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerMissionListEntryObjectTemplate.cpp @@ -16,6 +16,7 @@ #include "sharedFile/Iff.h" #include "sharedObject/ObjectTemplate.h" #include "sharedObject/ObjectTemplateList.h" +#include "sharedMath/Vector.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS #include diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTokenObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTokenObjectTemplate.cpp index c6a59dff..d43d6c37 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerTokenObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerTokenObjectTemplate.cpp @@ -16,6 +16,7 @@ #include "sharedFile/Iff.h" #include "sharedObject/ObjectTemplate.h" #include "sharedObject/ObjectTemplateList.h" +#include "sharedMath/Vector.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS #include diff --git a/engine/shared/library/sharedGame/src/CMakeLists.txt b/engine/shared/library/sharedGame/src/CMakeLists.txt index 7cb435dc..67f45c4e 100644 --- a/engine/shared/library/sharedGame/src/CMakeLists.txt +++ b/engine/shared/library/sharedGame/src/CMakeLists.txt @@ -197,18 +197,18 @@ set(SHARED_SOURCES shared/objectTemplate/SharedJediManagerObjectTemplate.h shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp shared/objectTemplate/SharedManufactureSchematicObjectTemplate.h + shared/objectTemplate/SharedMissionDataObjectTemplate.cpp + shared/objectTemplate/SharedMissionDataObjectTemplate.h + shared/objectTemplate/SharedMissionListEntryObjectTemplate.cpp + shared/objectTemplate/SharedMissionListEntryObjectTemplate.h shared/objectTemplate/SharedMissionObjectTemplate.cpp shared/objectTemplate/SharedMissionObjectTemplate.h - shared/objectTemplate/SharedObjectTemplateClientData.cpp - shared/objectTemplate/SharedObjectTemplateClientData.h - shared/objectTemplate/SharedObjectTemplateInterface.cpp - shared/objectTemplate/SharedObjectTemplateInterface.h shared/objectTemplate/SharedObjectTemplate.cpp shared/objectTemplate/SharedObjectTemplate.h - shared/objectTemplate/SharedPlayerQuestObjectTemplate.h - shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp shared/objectTemplate/SharedPlayerObjectTemplate.cpp shared/objectTemplate/SharedPlayerObjectTemplate.h + shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp + shared/objectTemplate/SharedPlayerQuestObjectTemplate.h shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp shared/objectTemplate/SharedResourceContainerObjectTemplate.h shared/objectTemplate/SharedShipObjectTemplate.cpp @@ -219,6 +219,8 @@ set(SHARED_SOURCES shared/objectTemplate/SharedTangibleObjectTemplate.h shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.h + shared/objectTemplate/SharedTokenObjectTemplate.cpp + shared/objectTemplate/SharedTokenObjectTemplate.h shared/objectTemplate/SharedUniverseObjectTemplate.cpp shared/objectTemplate/SharedUniverseObjectTemplate.h shared/objectTemplate/SharedVehicleObjectTemplate.cpp @@ -226,7 +228,7 @@ set(SHARED_SOURCES shared/objectTemplate/SharedWaypointObjectTemplate.cpp shared/objectTemplate/SharedWaypointObjectTemplate.h shared/objectTemplate/SharedWeaponObjectTemplate.cpp - shared/objectTemplate/SharedWeaponObjectTemplate.h + shared/objectTemplate/SharedWeaponObjectTemplate.h shared/quest/PlayerQuestData.cpp shared/quest/PlayerQuestData.h diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionDataObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionDataObjectTemplate.cpp index 9971f1f9..eba86734 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionDataObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionDataObjectTemplate.cpp @@ -16,6 +16,7 @@ #include "sharedFile/Iff.h" #include "sharedObject/ObjectTemplate.h" #include "sharedObject/ObjectTemplateList.h" +#include "sharedMath/Vector.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS #include diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionListEntryObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionListEntryObjectTemplate.cpp index 8f7ab9f4..a9e87da5 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionListEntryObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionListEntryObjectTemplate.cpp @@ -16,6 +16,7 @@ #include "sharedFile/Iff.h" #include "sharedObject/ObjectTemplate.h" #include "sharedObject/ObjectTemplateList.h" +#include "sharedMath/Vector.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS #include diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTokenObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTokenObjectTemplate.cpp index 3d9ed04c..43d4b8ea 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTokenObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTokenObjectTemplate.cpp @@ -16,6 +16,7 @@ #include "sharedFile/Iff.h" #include "sharedObject/ObjectTemplate.h" #include "sharedObject/ObjectTemplateList.h" +#include "sharedMath/Vector.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS #include diff --git a/engine/shared/library/sharedTemplate/src/CMakeLists.txt b/engine/shared/library/sharedTemplate/src/CMakeLists.txt index 1bd3b95f..075e9766 100644 --- a/engine/shared/library/sharedTemplate/src/CMakeLists.txt +++ b/engine/shared/library/sharedTemplate/src/CMakeLists.txt @@ -38,16 +38,22 @@ set(SHARED_SOURCES shared/template/ServerManufactureInstallationObjectTemplate.h shared/template/ServerManufactureSchematicObjectTemplate.cpp shared/template/ServerManufactureSchematicObjectTemplate.h + shared/template/ServerMissionBoardObjectTemplate.cpp + shared/template/ServerMissionBoardObjectTemplate.h + shared/template/ServerMissionDataObjectTemplate.cpp + shared/template/ServerMissionDataObjectTemplate.h + shared/template/ServerMissionListEntryObjectTemplate.cpp + shared/template/ServerMissionListEntryObjectTemplate.h shared/template/ServerMissionObjectTemplate.cpp shared/template/ServerMissionObjectTemplate.h shared/template/ServerObjectTemplate.cpp shared/template/ServerObjectTemplate.h shared/template/ServerPlanetObjectTemplate.cpp shared/template/ServerPlanetObjectTemplate.h - shared/template/ServerPlayerQuestObjectTemplate.cpp - shared/template/ServerPlayerQuestObjectTemplate.h shared/template/ServerPlayerObjectTemplate.cpp shared/template/ServerPlayerObjectTemplate.h + shared/template/ServerPlayerQuestObjectTemplate.cpp + shared/template/ServerPlayerQuestObjectTemplate.h shared/template/ServerResourceClassObjectTemplate.cpp shared/template/ServerResourceClassObjectTemplate.h shared/template/ServerResourceContainerObjectTemplate.cpp @@ -102,6 +108,10 @@ set(SHARED_SOURCES shared/template/SharedJediManagerObjectTemplate.h shared/template/SharedManufactureSchematicObjectTemplate.cpp shared/template/SharedManufactureSchematicObjectTemplate.h + shared/template/SharedMissionDataObjectTemplate.cpp + shared/template/SharedMissionDataObjectTemplate.h + shared/template/SharedMissionListEntryObjectTemplate.cpp + shared/template/SharedMissionListEntryObjectTemplate.h shared/template/SharedMissionObjectTemplate.cpp shared/template/SharedMissionObjectTemplate.h shared/template/SharedObjectTemplate.cpp @@ -129,7 +139,7 @@ set(SHARED_SOURCES shared/template/SharedWaypointObjectTemplate.cpp shared/template/SharedWaypointObjectTemplate.h shared/template/SharedWeaponObjectTemplate.cpp - shared/template/SharedWeaponObjectTemplate.h + shared/template/SharedWeaponObjectTemplate.h ) if(WIN32)