olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'type-cleanup' of https://github.com/Paril/ericw-tools into type-cleanup

This commit is contained in:
Jonathan 2021-10-05 21:38:19 -04:00
parent 81b7fbf916 f7ebe386f1
commit 2c9b59103f
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/cmake.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
# Don't cancel the macOS build if the Linux build fails, etc.
fail-fast: false
matrix:
os: [ubuntu-18.04, macos-10.15]
os: [ubuntu-20.04, macos-10.15]
steps:
- uses: actions/checkout@v2

2
3rdparty/json vendored

@ -1 +1 @@
Subproject commit bbdb29c6583e9e68f7f2bdce59a7384f061e0e32
Subproject commit 0db99d5ed1ba0c4409509db3916e7bd8398ee920

3
CMakeLists.txt
View File

@ -126,7 +126,8 @@ endif (MSVC)
# 10.9: minimum version that supports unordered_map
# 10.14: required by tbb 2021.3.0 (due to use of alignas)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14)
# 10.15: required by std::filesytstem
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
find_package(TBB REQUIRED)