Bladeren bron

[c::b] Updated projects, fixed build

AlexVinS 6 jaren geleden
bovenliggende
commit
5a8416bd19
5 gewijzigde bestanden met toevoegingen van 52 en 6 verwijderingen
  1. 2 2
      AI/VCAI/FuzzyEngines.h
  2. 1 1
      AI/VCAI/FuzzyHelper.h
  3. 47 2
      AI/VCAI/VCAI.cbp
  4. 1 0
      test/Test.cbp
  5. 1 1
      test/vcai/mock_VCAI_CGoal.h

+ 2 - 2
AI/VCAI/FuzzyEngines.h

@@ -8,7 +8,7 @@
 *
 */
 #pragma once
-#include "fl/Headers.h"
+#include <fl/Headers.h>
 #include "Goals/AbstractGoal.h"
 
 class CArmedInstance;
@@ -69,4 +69,4 @@ public:
 	float evaluate(Goals::VisitObj & goal);
 protected:
 	fl::InputVariable * objectValue;
-};
+};

+ 1 - 1
AI/VCAI/FuzzyHelper.h

@@ -12,7 +12,7 @@
 
 class CBank;
 
-class FuzzyHelper
+class DLL_EXPORT FuzzyHelper
 {
 public:
 	TacticalAdvantageEngine tacticalAdvantageEngine;

+ 47 - 2
AI/VCAI/VCAI.cbp

@@ -91,8 +91,53 @@
 		<Unit filename="FuzzyEngines.h" />
 		<Unit filename="FuzzyHelper.cpp" />
 		<Unit filename="FuzzyHelper.h" />
-		<Unit filename="Goals.cpp" />
-		<Unit filename="Goals.h" />
+		<Unit filename="Goals/AbstractGoal.cpp" />
+		<Unit filename="Goals/AbstractGoal.h" />
+		<Unit filename="Goals/AdventureSpellCast.cpp" />
+		<Unit filename="Goals/AdventureSpellCast.h" />
+		<Unit filename="Goals/Build.cpp" />
+		<Unit filename="Goals/Build.h" />
+		<Unit filename="Goals/BuildBoat.cpp" />
+		<Unit filename="Goals/BuildBoat.h" />
+		<Unit filename="Goals/BuildThis.cpp" />
+		<Unit filename="Goals/BuildThis.h" />
+		<Unit filename="Goals/BuyArmy.cpp" />
+		<Unit filename="Goals/BuyArmy.h" />
+		<Unit filename="Goals/CGoal.h" />
+		<Unit filename="Goals/ClearWayTo.cpp" />
+		<Unit filename="Goals/ClearWayTo.h" />
+		<Unit filename="Goals/CollectRes.cpp" />
+		<Unit filename="Goals/CollectRes.h" />
+		<Unit filename="Goals/CompleteQuest.cpp" />
+		<Unit filename="Goals/CompleteQuest.h" />
+		<Unit filename="Goals/Conquer.cpp" />
+		<Unit filename="Goals/Conquer.h" />
+		<Unit filename="Goals/DigAtTile.cpp" />
+		<Unit filename="Goals/DigAtTile.h" />
+		<Unit filename="Goals/Explore.cpp" />
+		<Unit filename="Goals/Explore.h" />
+		<Unit filename="Goals/FindObj.cpp" />
+		<Unit filename="Goals/FindObj.h" />
+		<Unit filename="Goals/GatherArmy.cpp" />
+		<Unit filename="Goals/GatherArmy.h" />
+		<Unit filename="Goals/GatherTroops.cpp" />
+		<Unit filename="Goals/GatherTroops.h" />
+		<Unit filename="Goals/GetArtOfType.cpp" />
+		<Unit filename="Goals/GetArtOfType.h" />
+		<Unit filename="Goals/Goals.h" />
+		<Unit filename="Goals/Invalid.h" />
+		<Unit filename="Goals/RecruitHero.cpp" />
+		<Unit filename="Goals/RecruitHero.h" />
+		<Unit filename="Goals/Trade.cpp" />
+		<Unit filename="Goals/Trade.h" />
+		<Unit filename="Goals/VisitHero.cpp" />
+		<Unit filename="Goals/VisitHero.h" />
+		<Unit filename="Goals/VisitObj.cpp" />
+		<Unit filename="Goals/VisitObj.h" />
+		<Unit filename="Goals/VisitTile.cpp" />
+		<Unit filename="Goals/VisitTile.h" />
+		<Unit filename="Goals/Win.cpp" />
+		<Unit filename="Goals/Win.h" />
 		<Unit filename="MapObjectsEvaluator.cpp" />
 		<Unit filename="MapObjectsEvaluator.h" />
 		<Unit filename="Pathfinding/AINodeStorage.cpp" />

+ 1 - 0
test/Test.cbp

@@ -61,6 +61,7 @@
 			<Add directory="../include" />
 			<Add directory="googletest/googletest" />
 			<Add directory="googletest/googlemock" />
+			<Add directory="../AI/FuzzyLite/fuzzylite" />
 		</Compiler>
 		<Linker>
 			<Add option="-lVCMI_lib" />

+ 1 - 1
test/vcai/mock_VCAI_CGoal.h

@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "../AI/VCAI/Goals.h"
+#include "../../AI/VCAI/Goals/Goals.h"
 
 namespace Goals
 {