Merge remote-tracking branch 'stjr/next' into patch-refactor

.circleci/config.yml

CMakeLists.txt

CMakePresets.json

README.md

SRB2.cbp

SRB2_common.props

Srb2.dev

alias-bootstrap.sh

appveyor.yml

cmake/Comptime.cmake

cmake/Modules/CMakeASM_YASMInformation.cmake

cmake/Modules/CMakeDetermineASM_YASMCompiler.cmake

cmake/Modules/CMakeTestASM_YASMCompiler.cmake

cmake/Modules/GitUtilities.cmake

src/Android.mk

src/CMakeLists.txt

src/Makefile

src/Makefile.d/features.mk

src/Makefile.d/nix.mk

src/Makefile.d/platform.mk