games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

Merge pull request #2845 from Alexander-Wilms/fuzzylite

Browse Source 
Support include path of more recent fuzzylite versions
This commit is contained in:
Andrii Danylchenko
2023-09-16 11:05:55 +03:00
committed by GitHub
parent a005829a57 6c15e5b426
commit 988531c6cb
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AI/Nullkiller/Engine/FuzzyEngines.h
View File

@@ -8,7 +8,11 @@
* *
*/ */
#pragma once #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" #include "../Goals/AbstractGoal.h"
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN

6
AI/Nullkiller/Engine/PriorityEvaluator.h
View File

@@ -8,7 +8,11 @@
* *
*/ */
#pragma once #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 "../Goals/CGoal.h"
#include "../Pathfinding/AIPathfinder.h" #include "../Pathfinding/AIPathfinder.h"

6
AI/VCAI/FuzzyEngines.h
View File

@@ -8,7 +8,11 @@
* *
*/ */
#pragma once #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" #include "Goals/AbstractGoal.h"
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN

6
cmake_modules/Findfuzzylite.cmake
View File

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