games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

MSVC: fixes for compatibility with latest Vcpkg packages

Browse Source
This commit is contained in:
Arseniy Shestakov
2018-08-27 22:19:11 +03:00
parent 47ba3b2476
commit edcaaf036a
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AI/VCAI/AIUtility.cpp
View File

@ -180,7 +180,7 @@ void foreach_neighbour(CCallback * cbp, const int3 & pos, std::function<void(CCa
} }
} }
bool CDistanceSorter::operator()(const CGObjectInstance * lhs, const CGObjectInstance * rhs) bool CDistanceSorter::operator()(const CGObjectInstance * lhs, const CGObjectInstance * rhs) const
{ {
const CGPathNode * ln = ai->myCb->getPathsInfo(hero)->getPathInfo(lhs->visitablePos()); const CGPathNode * ln = ai->myCb->getPathsInfo(hero)->getPathInfo(lhs->visitablePos());
const CGPathNode * rn = ai->myCb->getPathsInfo(hero)->getPathInfo(rhs->visitablePos()); const CGPathNode * rn = ai->myCb->getPathsInfo(hero)->getPathInfo(rhs->visitablePos());

2
AI/VCAI/AIUtility.h
View File

@ -186,5 +186,5 @@ public:
: hero(hero) : hero(hero)
{ {
} }
bool operator()(const CGObjectInstance * lhs, const CGObjectInstance * rhs); bool operator()(const CGObjectInstance * lhs, const CGObjectInstance * rhs) const;
}; };

3
CMakeLists.txt
View File

@ -154,6 +154,9 @@ if(WIN32)
# Reported to Microsoft here: # Reported to Microsoft here:
# https://developercommunity.visualstudio.com/content/problem/224597/linker-failing-because-of-multiple-definitions-of.html # 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") 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) endif(MSVC)
if(MINGW) if(MINGW)