Merge branch 'master' into jgrpp

# Conflicts:
#	.github/workflows/ci-build.yml
#	src/ai/ai_gui.cpp
#	src/blitter/32bpp_optimized.cpp
#	src/blitter/32bpp_simple.cpp
#	src/blitter/32bpp_sse2.cpp
#	src/blitter/8bpp_optimized.cpp
#	src/blitter/8bpp_simple.cpp
#	src/blitter/null.cpp
#	src/blitter/null.hpp
#	src/company_gui.cpp
#	src/game/game_gui.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/gfx_func.h
#	src/graph_gui.cpp
#	src/industry_gui.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/network/network_gui.cpp
#	src/newgrf_debug_gui.cpp
#	src/openttd.cpp
#	src/pathfinder/npf/aystar.h
#	src/road_gui.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/script/api/script_log.cpp
#	src/script/api/script_town.cpp
#	src/script/script_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/sortlist_type.h
#	src/spritecache.cpp
#	src/spriteloader/grf.cpp
#	src/spriteloader/grf.hpp
#	src/spriteloader/spriteloader.hpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_gui.cpp
#	src/strings.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/video/opengl.cpp
#	src/video/opengl.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
#	src/window_gui.h

regression/CMakeLists.txt

@@ -0,0 +1,24 @@
+    # Copy the regression configuration in a special folder, so all autogenerated
+    # folders end up in the same place after running regression.
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/regression.cfg
+            COMMAND ${CMAKE_COMMAND} -E copy
+                    ${CMAKE_CURRENT_SOURCE_DIR}/regression.cfg
+                    ${CMAKE_CURRENT_BINARY_DIR}/regression.cfg
+            MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/regression.cfg
+            COMMENT "Copying regression.cfg regression file"
+    )
+
+    # Create a new target which copies all regression files
+    # Subdirectory targets will add themselves as dependencies
+    add_custom_target(regression_files
+            ALL  # this is needed because 'make test' doesn't resolve dependencies, and otherwise this is never executed
+            DEPENDS
+            ${CMAKE_BINARY_DIR}/regression/regression.cfg
+    )
+
+    # Create a new target which runs the regression
+    # Subdirectory targets will add themselves as dependencies
+    add_custom_target(regression)
+
+    add_subdirectory(regression)
+    add_subdirectory(stationlist)

regression/regression/CMakeLists.txt

@@ -0,0 +1,8 @@
+include(CreateRegression)
+create_regression(
+    ${CMAKE_CURRENT_SOURCE_DIR}/info.nut
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.nut
+    ${CMAKE_CURRENT_SOURCE_DIR}/require.nut
+    ${CMAKE_CURRENT_SOURCE_DIR}/result.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/test.sav
+)

regression/stationlist/CMakeLists.txt

@@ -0,0 +1,7 @@
+include(CreateRegression)
+create_regression(
+    ${CMAKE_CURRENT_SOURCE_DIR}/info.nut
+    ${CMAKE_CURRENT_SOURCE_DIR}/main.nut
+    ${CMAKE_CURRENT_SOURCE_DIR}/result.txt
+    ${CMAKE_CURRENT_SOURCE_DIR}/test.sav
+)