Browse Source

Add include path of a more recent version of fuzzylite, which is required to build it with gcc 12.2.0

https://github.com/fuzzylite/fuzzylite/commit/a651f3d13e192352d7a02ee9da65ab591a963ab9
Alexander Wilms 2 năm trước cách đây
mục cha
commit
6c15e5b426

+ 5 - 1
AI/Nullkiller/Engine/FuzzyEngines.h

@@ -8,7 +8,11 @@
 *
 */
 #pragma once
-#include <fl/Headers.h>
+#if __has_include(<fuzzylite/Headers.h>)
+#  include <fuzzylite/Headers.h>
+#else
+#  include <fl/Headers.h>
+#endif
 #include "../Goals/AbstractGoal.h"
 
 VCMI_LIB_NAMESPACE_BEGIN

+ 5 - 1
AI/Nullkiller/Engine/PriorityEvaluator.h

@@ -8,7 +8,11 @@
 *
 */
 #pragma once
-#include "fl/Headers.h"
+#if __has_include(<fuzzylite/Headers.h>)
+#  include <fuzzylite/Headers.h>
+#else
+#  include <fl/Headers.h>
+#endif
 #include "../Goals/CGoal.h"
 #include "../Pathfinding/AIPathfinder.h"
 

+ 5 - 1
AI/VCAI/FuzzyEngines.h

@@ -8,7 +8,11 @@
 *
 */
 #pragma once
-#include <fl/Headers.h>
+#if __has_include(<fuzzylite/Headers.h>)
+#  include <fuzzylite/Headers.h>
+#else
+#  include <fl/Headers.h>
+#endif
 #include "Goals/AbstractGoal.h"
 
 VCMI_LIB_NAMESPACE_BEGIN

+ 4 - 2
cmake_modules/Findfuzzylite.cmake

@@ -21,11 +21,13 @@
 
 find_path(fuzzylite_INCLUDE_DIR 
     fl/fuzzylite.h
+    fuzzylite/fuzzylite.h
   HINTS
     ENV FLDIR
   PATH_SUFFIXES
     fl
-    include/fl 
+    include/fl
+    include/fuzzylite 
     include
 )
 
@@ -62,4 +64,4 @@ if (NOT TARGET "fuzzylite::fuzzylite" AND fuzzylite_FOUND)
 		IMPORTED_LOCATION "${fuzzylite_LIBRARY}")
 endif()
 
-mark_as_advanced(fuzzylite_LIBRARY fuzzylite_INCLUDE_DIR)
+mark_as_advanced(fuzzylite_LIBRARY fuzzylite_INCLUDE_DIR)