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/bootstrap_gui.cpp
This commit is contained in:
Jonathan G Rennison
2020-12-07 17:56:44 +00:00
parent ba11cd59af dddf885fb4
commit 4da3cfcf56
19 changed files with 94 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -137,6 +137,9 @@ if(WIN32)
list(APPEND GENERATED_SOURCE_FILES "${CMAKE_BINARY_DIR}/generated/ottdres.rc")
endif()
# An empty target for the tools
add_custom_target(tools)
include(SourceList)
include(Endian)
add_endian_definition()
@@ -226,7 +229,7 @@ include(LinkPackage)
link_package(PNG TARGET PNG::PNG ENCOURAGED)
link_package(ZLIB TARGET ZLIB::ZLIB ENCOURAGED)
link_package(LIBLZMA TARGET LibLZMA::LibLZMA ENCOURAGED)
link_package(LZO ENCOURAGED)
link_package(LZO)
link_package(XDG_basedir)
if(NOT OPTION_DEDICATED)