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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/commit-checker.yml
#	src/openttd.cpp
This commit is contained in:
Jonathan G Rennison
2020-12-27 20:16:16 +00:00
parent aefefb61c2 b7851e51ad
commit 483ed2f468
80 changed files with 331 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/scripts/FindVersion.cmake
View File

@@ -172,4 +172,16 @@ else()
message(STATUS "Generating CPackProperties.cmake")
configure_file("${CMAKE_SOURCE_DIR}/CPackProperties.cmake.in"
"${CPACK_BINARY_DIR}/CPackProperties.cmake" @ONLY)
message(STATUS "Generating Doxyfile")
configure_file("${CMAKE_SOURCE_DIR}/Doxyfile.in"
"${CPACK_BINARY_DIR}/Doxyfile")
message(STATUS "Generating Doxyfile_AI")
configure_file("${CMAKE_SOURCE_DIR}/src/script/api/Doxyfile_AI.in"
"${CPACK_BINARY_DIR}/Doxyfile_AI")
message(STATUS "Generating Doxyfile_GS")
configure_file("${CMAKE_SOURCE_DIR}/src/script/api/Doxyfile_GS.in"
"${CPACK_BINARY_DIR}/Doxyfile_GS")
endif()

4
cmake/scripts/Regression.cmake
View File

@@ -19,8 +19,8 @@ endif()
# subsystem to console. The copy is needed as multiple regressions can run
# at the same time.
if(EDITBIN_EXECUTABLE)
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${OPENTTD_EXECUTABLE} regression/${REGRESSION_TEST}.exe)
set(OPENTTD_EXECUTABLE "regression/${REGRESSION_TEST}.exe")
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${OPENTTD_EXECUTABLE} regression_${REGRESSION_TEST}.exe)
set(OPENTTD_EXECUTABLE "regression_${REGRESSION_TEST}.exe")
execute_process(COMMAND ${EDITBIN_EXECUTABLE} /nologo /subsystem:console ${OPENTTD_EXECUTABLE})
endif()