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

cmake/CreateGrfCommand.cmake

@@ -1,16 +1,13 @@
 # Macro which contains all bits and pieces to create a single grf file based
 # on NFO and PNG files.
 #
-# create_grf_command()
+# create_grf_command(NFO_SOURCE_FILES nfo_file1 ... PNG_SOURCE_FILES png_file1 ...)
 #
 function(create_grf_command)
-    set(EXTRA_PNG_SOURCE_FILES ${ARGV})
+    cmake_parse_arguments(GRF "" "" "NFO_SOURCE_FILES;PNG_SOURCE_FILES" ${ARGN})
 
     get_filename_component(GRF_SOURCE_FOLDER_NAME "${CMAKE_CURRENT_SOURCE_DIR}" NAME)
     get_filename_component(GRF_BINARY_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../${GRF_SOURCE_FOLDER_NAME}.grf ABSOLUTE)
-    file(GLOB_RECURSE GRF_PNG_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.png)
-    file(GLOB_RECURSE GRF_NFO_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.nfo)
-    set(GRF_PNG_SOURCE_FILES ${GRF_PNG_SOURCE_FILES} ${EXTRA_PNG_SOURCE_FILES})
 
     # Copy over all the PNG files to the correct folder
     foreach(GRF_PNG_SOURCE_FILE IN LISTS GRF_PNG_SOURCE_FILES)

cmake/CreateRegression.cmake

@@ -3,20 +3,15 @@
 # 'ctest'. The first is prefered, as it is more verbose, and takes care of
 # dependencies correctly.
 #
-# create_regression()
+# create_regression(file1 ...)
 #
 macro(create_regression)
-    # Find all the files in the regression folder; they need to be copied to the
-    # build folder before we can run the regression
-    file(GLOB_RECURSE REGRESSION_SOURCE_FILES ${CMAKE_SOURCE_DIR}/regression/*)
+    set(REGRESSION_SOURCE_FILES ${ARGN})
+
     foreach(REGRESSION_SOURCE_FILE IN LISTS REGRESSION_SOURCE_FILES)
         string(REPLACE "${CMAKE_SOURCE_DIR}/regression/" "" REGRESSION_SOURCE_FILE_NAME "${REGRESSION_SOURCE_FILE}")
         string(CONCAT REGRESSION_BINARY_FILE "${CMAKE_BINARY_DIR}/ai/" "${REGRESSION_SOURCE_FILE_NAME}")
 
-        if("${REGRESSION_SOURCE_FILE_NAME}" STREQUAL "regression.cfg")
-            continue()
-        endif()
-
         add_custom_command(OUTPUT ${REGRESSION_BINARY_FILE}
                 COMMAND ${CMAKE_COMMAND} -E copy
                         ${REGRESSION_SOURCE_FILE}
@@ -28,59 +23,36 @@ macro(create_regression)
         list(APPEND REGRESSION_BINARY_FILES ${REGRESSION_BINARY_FILE})
     endforeach()
 
-    # 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_BINARY_DIR}/regression/regression.cfg
-            COMMAND ${CMAKE_COMMAND} -E copy
-                    ${CMAKE_SOURCE_DIR}/regression/regression.cfg
-                    ${CMAKE_BINARY_DIR}/regression/regression.cfg
-            MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/regression/regression.cfg
-            COMMENT "Copying ${REGRESSION_SOURCE_FILE_NAME} regression file"
-    )
-    list(APPEND REGRESSION_BINARY_FILES ${CMAKE_BINARY_DIR}/regression/regression.cfg)
+    get_filename_component(REGRESSION_TEST_NAME "${CMAKE_CURRENT_SOURCE_DIR}" NAME)
 
-    # Create a new target which copies all regression files
-    add_custom_target(regression_files
-            ALL  # this is needed because 'make test' doesn't resolve dependencies, and otherwise this is never executed
+    # Create a new target which copies regression files
+    add_custom_target(regression_${REGRESSION_TEST_NAME}_files
             DEPENDS
             ${REGRESSION_BINARY_FILES}
     )
 
-    enable_testing()
+    add_dependencies(regression_files regression_${REGRESSION_TEST_NAME}_files)
 
-    # Find all the tests we have, and create a target for them
-    file(GLOB REGRESSION_TESTS ${CMAKE_SOURCE_DIR}/regression/*)
-    foreach(REGRESSION_TEST IN LISTS REGRESSION_TESTS)
-        get_filename_component(REGRESSION_TEST_NAME "${REGRESSION_TEST}" NAME)
+    add_custom_target(regression_${REGRESSION_TEST_NAME}
+            COMMAND ${CMAKE_COMMAND}
+                    -DOPENTTD_EXECUTABLE=$<TARGET_FILE:openttd>
+                    -DEDITBIN_EXECUTABLE=${EDITBIN_EXECUTABLE}
+                    -DREGRESSION_TEST=${REGRESSION_TEST_NAME}
+                    -P "${CMAKE_SOURCE_DIR}/cmake/scripts/Regression.cmake"
+            DEPENDS openttd regression_${REGRESSION_TEST_NAME}_files
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+            COMMENT "Running regression test ${REGRESSION_TEST_NAME}"
+    )
 
-        if("${REGRESSION_TEST_NAME}" STREQUAL "regression.cfg")
-            continue()
-        endif()
+    # Also make sure that 'make test' runs the regression
+    add_test(NAME regression_${REGRESSION_TEST_NAME}
+            COMMAND ${CMAKE_COMMAND}
+                    -DOPENTTD_EXECUTABLE=$<TARGET_FILE:openttd>
+                    -DEDITBIN_EXECUTABLE=${EDITBIN_EXECUTABLE}
+                    -DREGRESSION_TEST=${REGRESSION_TEST_NAME}
+                    -P "${CMAKE_SOURCE_DIR}/cmake/scripts/Regression.cmake"
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
 
-        add_custom_target(regression_${REGRESSION_TEST_NAME}
-                COMMAND ${CMAKE_COMMAND}
-                        -DOPENTTD_EXECUTABLE=$<TARGET_FILE:openttd>
-                        -DEDITBIN_EXECUTABLE=${EDITBIN_EXECUTABLE}
-                        -DREGRESSION_TEST=${REGRESSION_TEST_NAME}
-                        -P "${CMAKE_SOURCE_DIR}/cmake/scripts/Regression.cmake"
-                DEPENDS openttd regression_files
-                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                COMMENT "Running regression test ${REGRESSION_TEST_NAME}"
-                )
-
-        # Also make sure that 'make test' runs the regression
-        add_test(NAME regression_${REGRESSION_TEST_NAME}
-                COMMAND ${CMAKE_COMMAND}
-                        -DOPENTTD_EXECUTABLE=$<TARGET_FILE:openttd>
-                        -DEDITBIN_EXECUTABLE=${EDITBIN_EXECUTABLE}
-                        -DREGRESSION_TEST=${REGRESSION_TEST_NAME}
-                        -P "${CMAKE_SOURCE_DIR}/cmake/scripts/Regression.cmake"
-                WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-
-        list(APPEND REGRESSION_TARGETS regression_${REGRESSION_TEST_NAME})
-    endforeach()
-
-    # Create a new target which runs the regression
-    add_custom_target(regression
-            DEPENDS ${REGRESSION_TARGETS})
+    add_dependencies(regression regression_${REGRESSION_TEST_NAME})
 endmacro()

cmake/scripts/CreateGRF.cmake

@@ -21,6 +21,9 @@ if(NOT GRF_BINARY_FILE)
     message(FATAL_ERROR "Script needs GRF_BINARY_FILE defined")
 endif()
 
+# Remove the existing output so failures never go unnoticed
+file(REMOVE ${GRF_BINARY_FILE} ${GRF_BINARY_FILE}.hash)
+
 get_filename_component(GRF_SOURCE_FOLDER_NAME "${GRF_SOURCE_FOLDER}" NAME)
 
 file(WRITE sprites/${GRF_SOURCE_FOLDER_NAME}.nfo "")