Merge branch 'master' into jgrpp

# Conflicts:
#	CMakeLists.txt
#	src/blitter/32bpp_optimized.cpp
#	src/lang/serbian.txt
This commit is contained in:
Jonathan G Rennison
2021-03-04 15:31:10 +00:00
3 changed files with 31 additions and 22 deletions

View File

@@ -75,6 +75,9 @@ jobs:
- compiler: gcc
cxxcompiler: g++
libsdl: libsdl1.2-dev
- compiler: gcc
cxxcompiler: g++
extra-cmake-parameters: -DOPTION_DEDICATED=ON
runs-on: ubuntu-20.04
env:
@@ -130,7 +133,7 @@ jobs:
cd build
echo "::group::CMake"
cmake ..
cmake .. ${{ matrix.extra-cmake-parameters }}
echo "::endgroup::"
echo "::group::Build"