Merge branch 'master' into jgrpp

# Conflicts:
#	src/saveload/afterload.cpp
This commit is contained in:
Jonathan G Rennison
2021-11-20 13:15:32 +00:00
14 changed files with 35 additions and 23 deletions

View File

@@ -76,7 +76,7 @@ jobs:
echo "::group::CMake"
emcmake cmake .. \
-DHOST_BINARY_DIR=../build-host \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_BUILD_TYPE=Release \
# EOF
echo "::endgroup::"