diff --git a/AI/VCAI/AIUtility.cpp b/AI/VCAI/AIUtility.cpp index 3d614b34c..854196ad8 100644 --- a/AI/VCAI/AIUtility.cpp +++ b/AI/VCAI/AIUtility.cpp @@ -180,7 +180,7 @@ void foreach_neighbour(CCallback * cbp, const int3 & pos, std::functionmyCb->getPathsInfo(hero)->getPathInfo(lhs->visitablePos()); const CGPathNode * rn = ai->myCb->getPathsInfo(hero)->getPathInfo(rhs->visitablePos()); diff --git a/AI/VCAI/AIUtility.h b/AI/VCAI/AIUtility.h index 6c2d6414f..6e260f56e 100644 --- a/AI/VCAI/AIUtility.h +++ b/AI/VCAI/AIUtility.h @@ -186,5 +186,5 @@ public: : hero(hero) { } - bool operator()(const CGObjectInstance * lhs, const CGObjectInstance * rhs); -}; \ No newline at end of file + bool operator()(const CGObjectInstance * lhs, const CGObjectInstance * rhs) const; +}; diff --git a/CMakeLists.txt b/CMakeLists.txt index ea33746a9..0ce259f80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,6 +154,9 @@ if(WIN32) # Reported to Microsoft here: # https://developercommunity.visualstudio.com/content/problem/224597/linker-failing-because-of-multiple-definitions-of.html set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /FORCE:MULTIPLE") + + # Required at least for compatibility with Boost 1.68 on Vcpkg + set(SYSTEM_LIBS ${SYSTEM_LIBS} bcrypt) endif(MSVC) if(MINGW)