mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 20:29:57 +00:00
Code Issues Releases Wiki Activity

reinstall fontconfig as needed; const an imbigious == operator

Browse source
This commit is contained in:
Bret Curtis 2022-02-25 15:47:11 +01:00
parent 4b742dd461
commit ad11cc8d8a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CI/before_install.osx.sh
View file

@ -9,7 +9,7 @@ brew update --quiet
[ -z "${TRAVIS}" ] && brew uninstall --ignore-dependencies qt@6 || true [ -z "${TRAVIS}" ] && brew uninstall --ignore-dependencies qt@6 || true
# Some of these tools can come from places other than brew, so check before installing # Some of these tools can come from places other than brew, so check before installing
[ -z "${TRAVIS}" ] && brew install fontconfig [ -z "${TRAVIS}" ] && brew reinstall fontconfig
command -v ccache >/dev/null 2>&1 || brew install ccache command -v ccache >/dev/null 2>&1 || brew install ccache
command -v cmake >/dev/null 2>&1 || brew install cmake command -v cmake >/dev/null 2>&1 || brew install cmake
command -v qmake >/dev/null 2>&1 || brew install qt@5 command -v qmake >/dev/null 2>&1 || brew install qt@5

2
apps/openmw/mwrender/globalmap.cpp
View file

@ -453,7 +453,7 @@ namespace MWRender
: mLeft(left), mTop(top), mRight(right), mBottom(bottom) : mLeft(left), mTop(top), mRight(right), mBottom(bottom)
{ {
} }
bool operator == (const Box& other) bool operator == (const Box& other) const
{ {
return mLeft == other.mLeft && mTop == other.mTop && mRight == other.mRight && mBottom == other.mBottom; return mLeft == other.mLeft && mTop == other.mTop && mRight == other.mRight && mBottom == other.mBottom;
} }