From db0993f50096b4fec319523585a2d4f756735e17 Mon Sep 17 00:00:00 2001
From: glx22 <glx@openttd.org>
Date: Wed, 3 Mar 2021 18:26:09 +0100
Subject: [PATCH 1/3] Change: [Actions] Also check dedicated build

---
 .github/workflows/ci-build.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index d5bd304028..1aa7e17ccb 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -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:
@@ -129,7 +132,7 @@ jobs:
         cd build
 
         echo "::group::CMake"
-        cmake ..
+        cmake .. ${{ matrix.extra-cmake-parameters }}
         echo "::endgroup::"
 
         echo "::group::Build"

From 1d79f55a46f498e6c4052abdfd11d87aaab87793 Mon Sep 17 00:00:00 2001
From: glx22 <glx@openttd.org>
Date: Wed, 3 Mar 2021 19:48:32 +0100
Subject: [PATCH 2/3] Fix: [CMake] Skip detection for unused libs for dedicated
 builds

---
 CMakeLists.txt | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 728057ce81..9a85bd581e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,28 +119,31 @@ find_package(LibLZMA)
 find_package(LZO)
 find_package(PNG)
 
-if(NOT WIN32)
-    find_package(Allegro)
-    if(NOT APPLE)
-        find_package(Freetype)
-        find_package(SDL2)
-        if(NOT SDL2_FOUND)
-            find_package(SDL)
+if(NOT OPTION_DEDICATED)
+    if(NOT WIN32)
+        find_package(Allegro)
+        if(NOT APPLE)
+            find_package(Freetype)
+            find_package(SDL2)
+            if(NOT SDL2_FOUND)
+                find_package(SDL)
+            endif()
+            find_package(Fluidsynth)
+            find_package(Fontconfig)
+            find_package(ICU OPTIONAL_COMPONENTS i18n lx)
         endif()
-        find_package(Fluidsynth)
-        find_package(Fontconfig)
-        find_package(ICU OPTIONAL_COMPONENTS i18n lx)
-    else()
-        find_package(Iconv)
-
-        find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
-        find_library(AUDIOUNIT_LIBRARY AudioUnit)
-        find_library(COCOA_LIBRARY Cocoa)
-        find_library(QUARTZCORE_LIBRARY QuartzCore)
     endif()
 endif()
+if(APPLE)
+    find_package(Iconv)
 
-if(NOT EMSCRIPTEN)
+    find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
+    find_library(AUDIOUNIT_LIBRARY AudioUnit)
+    find_library(COCOA_LIBRARY Cocoa)
+    find_library(QUARTZCORE_LIBRARY QuartzCore)
+endif()
+
+if(NOT EMSCRIPTEN AND NOT OPTION_DEDICATED)
     find_package(OpenGL COMPONENTS OpenGL)
 endif()
 

From 349dc568ea591d5298db9ecfb3ea5e235796eb3a Mon Sep 17 00:00:00 2001
From: glx22 <glx@openttd.org>
Date: Wed, 3 Mar 2021 22:17:15 +0100
Subject: [PATCH 3/3] Fix: [CMake] Remove timestamps from regression output

---
 cmake/scripts/Regression.cmake | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cmake/scripts/Regression.cmake b/cmake/scripts/Regression.cmake
index 620ed2c2ca..e21a86d292 100644
--- a/cmake/scripts/Regression.cmake
+++ b/cmake/scripts/Regression.cmake
@@ -53,6 +53,9 @@ string(REPLACE "0x(nil)" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
 string(REPLACE "0x0000000000000000" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
 string(REPLACE "0x0x0" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
 
+# Remove timestamps if any
+string(REGEX REPLACE "\[[0-9-]+ [0-9:]+\] " "" REGRESSION_RESULT "${REGRESSION_RESULT}")
+
 # Convert the output to a format that is expected (and more readable) by result.txt
 string(REPLACE "\ndbg: [script]" "\n" REGRESSION_RESULT "${REGRESSION_RESULT}")
 string(REPLACE "\n " "\nERROR: " REGRESSION_RESULT "${REGRESSION_RESULT}")