dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	CMakeLists.txt
#	src/blitter/32bpp_optimized.cpp
#	src/lang/serbian.txt
This commit is contained in:
Jonathan G Rennison
2021-03-04 15:31:10 +00:00
parent 5a364d3e8c 349dc568ea
commit eab32e8861
3 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/ci-build.yml vendored
View File

@@ -75,6 +75,9 @@ jobs:
- compiler: gcc - compiler: gcc
cxxcompiler: g++ cxxcompiler: g++
libsdl: libsdl1.2-dev libsdl: libsdl1.2-dev
- compiler: gcc
cxxcompiler: g++
extra-cmake-parameters: -DOPTION_DEDICATED=ON
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
env: env:
@@ -130,7 +133,7 @@ jobs:
cd build cd build
echo "::group::CMake" echo "::group::CMake"
cmake .. cmake .. ${{ matrix.extra-cmake-parameters }}
echo "::endgroup::" echo "::endgroup::"
echo "::group::Build" echo "::group::Build"

11
CMakeLists.txt
View File

@@ -117,6 +117,7 @@ find_package(LZO)
find_package(ZSTD 1.4) find_package(ZSTD 1.4)
find_package(PNG) find_package(PNG)
if(NOT OPTION_DEDICATED)
if(NOT WIN32) if(NOT WIN32)
find_package(Allegro) find_package(Allegro)
if(NOT APPLE) if(NOT APPLE)
@@ -128,7 +129,10 @@ if(NOT WIN32)
find_package(Fluidsynth) find_package(Fluidsynth)
find_package(Fontconfig) find_package(Fontconfig)
find_package(ICU OPTIONAL_COMPONENTS i18n lx) find_package(ICU OPTIONAL_COMPONENTS i18n lx)
else() endif()
endif()
endif()
if(APPLE)
find_package(Iconv) find_package(Iconv)
find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox) find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
@@ -138,9 +142,8 @@ if(NOT WIN32)
find_package(MacUcontext) find_package(MacUcontext)
endif() endif()
endif()
if(NOT EMSCRIPTEN) if(NOT EMSCRIPTEN AND NOT OPTION_DEDICATED)
find_package(OpenGL COMPONENTS OpenGL) find_package(OpenGL COMPONENTS OpenGL)
endif() endif()
@@ -160,7 +163,7 @@ if (UNIX)
find_package(BFD) find_package(BFD)
endif (UNIX) endif (UNIX)
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE AND NOT OPTION_DEDICATED)
find_package(Fcitx QUIET) find_package(Fcitx QUIET)
if (Fcitx_FOUND) if (Fcitx_FOUND)
message(STATUS "Found: Fcitx: ${Fcitx_VERSION}") message(STATUS "Found: Fcitx: ${Fcitx_VERSION}")

3
cmake/scripts/Regression.cmake
View File

@@ -53,6 +53,9 @@ string(REPLACE "0x(nil)" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
string(REPLACE "0x0000000000000000" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}") string(REPLACE "0x0000000000000000" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
string(REPLACE "0x0x0" "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 # 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 "\ndbg: [script]" "\n" REGRESSION_RESULT "${REGRESSION_RESULT}")
string(REPLACE "\n " "\nERROR: " REGRESSION_RESULT "${REGRESSION_RESULT}") string(REPLACE "\n " "\nERROR: " REGRESSION_RESULT "${REGRESSION_RESULT}")