Merge pull request #19574 from hrydgard/some-more-fixes #10202

Job	Run time
build-uwp	7m 56s
build (ubuntu-latest, test, clang, clang++, ./b.sh --headless --unittest, clang-normal)	4m 56s
build-windows (x64)	9m 38s
build (ubuntu-latest, gcc, g++, ./b.sh --headless --unittest, gcc-normal)	4m 57s
build (ubuntu-latest, android, clang, clang++, cd android && ./ab.sh -j2 APP_ABI=arm64-v8a UNITTE...	9m 48s
build-windows (ARM64)	9m 51s
build (ubuntu-latest, android, clang, clang++, cd android && ./ab.sh -j2 APP_ABI=armeabi-v7a UNIT...	7m 40s
build_test_headless_alpine	12m 47s
build (ubuntu-latest, android, clang, clang++, cd android && ./ab.sh -j2 APP_ABI=x86_64 UNITTEST=...	9m 35s
build (ubuntu-latest, android, clang, clang++, cd android && ./ab.sh -j2 APP_ABI=arm64-v8a OPENXR...	9m 21s
build (ubuntu-latest, android, clang, clang++, ./b.sh --libretro_android ppsspp_libretro, android...	5m 53s
build (ubuntu-latest, qt, gcc, g++, ./b.sh --qt, qt)	5m 23s
build (ubuntu-latest, libretro, gcc, g++, make -C libretro -f Makefile -j2, gcc-libretro)	3m 26s
build (ubuntu-latest, libretro, clang, clang++, make -C libretro -f Makefile -j2, clang-libretro)	4m 16s
build (macos-latest, test, clang, clang++, ./b.sh --headless --unittest --fat --no-png --no-sdl2,...	8m 3s
build (macos-latest, ios, clang, clang++, ./b.sh --ios, ios)	4m 12s
test (ubuntu-latest)	1m 28s
test (macos-latest)	1m 23s
test-windows	1m 11s
	2h 1m 44s

Provide feedback