cpp/openttd-patchpack/source Changeset - r24244:556df3f1e087

Changeset - r24244:556df3f1e087

Parent rev.

Child rev.

[Not reviewed]

master

! ! !

Patric Stout - 6 years ago 2019-04-07 09:57:55
truebrain@openttd.org

Add: introduce CMake for project management

CMake works on all our supported platforms, like MSVC, Mingw, GCC,
Clang, and many more. It allows for a single way of doing things,
so no longer we need shell scripts and vbs scripts to work on all
our supported platforms.

Additionally, CMake allows to generate project files for like MSVC,
KDevelop, etc.

This heavily reduces the lines of code we need to support multiple
platforms from a project perspective.

Addtiionally, this heavily improves our detection of libraries, etc.

69 files changed with 3116 insertions and 1144 deletions:

.gitignore

CMakeLists.txt

226

cmake/AddCustomXXXTimestamp.cmake

145

cmake/CompileFlags.cmake

120

cmake/CreateGrfCommand.cmake

cmake/CreateRegression.cmake

cmake/Endian.cmake

cmake/FindAllegro.cmake

cmake/FindEditbin.cmake

cmake/FindFluidsynth.cmake

cmake/FindFontconfig.cmake

101

cmake/FindGrfcodec.cmake

cmake/FindICU.cmake

cmake/FindIconv.cmake

133

cmake/FindLZO.cmake

cmake/FindSSE.cmake

cmake/FindXDG_basedir.cmake

cmake/FindXaudio2.cmake

cmake/LinkPackage.cmake

cmake/Options.cmake

cmake/SourceList.cmake

cmake/Static.cmake

cmake/scripts/FindVersion.cmake

134

media/baseset/CMakeLists.txt

media/baseset/openttd/CMakeLists.txt

media/baseset/orig_extra/CMakeLists.txt

os/windows/openttd.manifest

src/3rdparty/CMakeLists.txt

src/3rdparty/md5/CMakeLists.txt

src/3rdparty/os2/CMakeLists.txt

src/3rdparty/squirrel/CMakeLists.txt

src/3rdparty/squirrel/include/CMakeLists.txt

src/3rdparty/squirrel/sqstdlib/CMakeLists.txt

src/3rdparty/squirrel/squirrel/CMakeLists.txt

src/CMakeLists.txt

479

src/ai/CMakeLists.txt

src/blitter/CMakeLists.txt

src/core/CMakeLists.txt

src/core/endian_type.hpp

src/depend/depend.cpp

1084

src/game/CMakeLists.txt

src/lang/CMakeLists.txt

122

src/linkgraph/CMakeLists.txt

src/misc/CMakeLists.txt

src/music/CMakeLists.txt

src/network/CMakeLists.txt

src/network/core/CMakeLists.txt

src/os/CMakeLists.txt

src/os/macosx/CMakeLists.txt

src/os/os2/CMakeLists.txt

src/os/unix/CMakeLists.txt

src/os/windows/CMakeLists.txt

src/os/windows/ottdres.rc.in

src/pathfinder/CMakeLists.txt

src/pathfinder/npf/CMakeLists.txt

src/pathfinder/yapf/CMakeLists.txt

src/rev.cpp.in

src/saveload/CMakeLists.txt

src/script/CMakeLists.txt

src/script/api/CMakeLists.txt

140

src/settingsgen/CMakeLists.txt

src/sound/CMakeLists.txt

src/spriteloader/CMakeLists.txt

src/stdafx.h

src/strgen/CMakeLists.txt

src/table/CMakeLists.txt

src/video/CMakeLists.txt

src/video/cocoa/CMakeLists.txt

src/widgets/CMakeLists.txt

0 comments (0 inline, 0 general)

.gitignore

➞

Show inline comments

@@ @@ -21,18 +21,13 @@ bin/scripts/* @@
 !bin/scripts/*.example
 !bin/scripts/readme.txt
 *.aps
 bundle/*
 bundles/*
 docs/aidocs/*
 docs/gamedocs/*
 docs/source/*
 .kdev4
 .kdev4/*
 *.kdev4
 media/openttd.desktop
 media/openttd.desktop.install
 objs/*
 projects/.vs
 projects/Debug
 projects/Release
@@ @@ -44,8 +39,6 @@ projects/*.vcproj.*.user @@
 projects/*.vcxproj.user
 projects/*.VC.db
 projects/*.VC.opendb
 src/rev.cpp
 src/os/windows/ottdres.rc
 /Makefile*
 !/Makefile.msvc

CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 cmake_minimum_required(VERSION 3.5)
 project(OpenTTD)
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
     message(FATAL_ERROR "In-source builds not allowed. Please run \"cmake ..\" from the bin directory")
 endif (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 include(Options)
 set_options()
 set_directory_options()
 include(Static)
 set_static_if_needed()
 # Prefer -pthread over -lpthread, which is often the better option of the two.
 set(CMAKE_THREAD_PREFER_PTHREAD YES)
 # Make sure we have Threads available.
 find_package(Threads REQUIRED)
 find_package(ZLIB)
 find_package(LibLZMA)
 find_package(LZO)
 find_package(PNG)
 if (NOT WIN32)
     find_package(SDL2)
     if (NOT SDL2_FOUND)
         find_package(SDL)
     endif( NOT SDL2_FOUND)
     find_package(Allegro)
     find_package(Fluidsynth)
     find_package(Freetype)
     find_package(Fontconfig)
     find_package(ICU OPTIONAL_COMPONENTS i18n lx)
     find_package(XDG_basedir)
 endif (NOT WIN32)
 if (APPLE)
     find_package(Iconv)
     find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
     find_library(AUDIOUNIT_LIBRARY AudioUnit)
     find_library(COCOA_LIBRARY Cocoa)
 endif (APPLE)
 if (MSVC)
     find_package(Editbin REQUIRED)
 endif (MSVC)
 find_package(SSE)
 find_package(Xaudio2)
 find_package(Grfcodec)
 # IPO is only properly supported from CMake 3.9. Despite the fact we are
 # CMake 3.5, still enable IPO if we detect we are 3.9+.
 if (POLICY CMP0069)
     cmake_policy(SET CMP0069 NEW)
     include(CheckIPOSupported)
     check_ipo_supported(RESULT IPO_FOUND)
 endif (POLICY CMP0069)
 show_options()
 if (UNIX AND NOT APPLE AND NOT OPTION_DEDICATED)
     if (NOT SDL_FOUND AND NOT SDL2_FOUND)
         message(FATAL_ERROR "SDL or SDL2 is required for this platform")
     endif (NOT SDL_FOUND AND NOT SDL2_FOUND)
 endif (UNIX AND NOT APPLE AND NOT OPTION_DEDICATED)
 if (APPLE)
     if (NOT AUDIOTOOLBOX_LIBRARY)
         message(FATAL_ERROR "AudioToolbox is required for this platform")
     endif (NOT AUDIOTOOLBOX_LIBRARY)
     if (NOT AUDIOUNIT_LIBRARY)
         message(FATAL_ERROR "AudioUnit is required for this platform")
     endif (NOT AUDIOUNIT_LIBRARY)
     if (NOT COCOA_LIBRARY)
         message(FATAL_ERROR "Cocoa is required for this platform")
     endif (NOT COCOA_LIBRARY)
 endif (APPLE)
 if (MSVC)
     # C++17 for MSVC
     set(CMAKE_CXX_STANDARD 17)
 else (MSVC)
     # C++11 for all other targets
     set(CMAKE_CXX_STANDARD 11)
 endif (MSVC)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 set(CMAKE_CXX_EXTENSIONS NO)
 list(APPEND GENERATED_SOURCE_FILES "${CMAKE_BINARY_DIR}/generated/rev.cpp")
 if (WIN32)
     list(APPEND GENERATED_SOURCE_FILES "${CMAKE_BINARY_DIR}/generated/ottdres.rc")
 endif (WIN32)
 # Generate a target to determine version, which is execute every 'make' run
 add_custom_target(find_version
         ${CMAKE_COMMAND}
                 -DFIND_VERSION_BINARY_DIR=${CMAKE_BINARY_DIR}/generated
                 -DCPACK_BINARY_DIR=${CMAKE_BINARY_DIR}
                 -P "${CMAKE_SOURCE_DIR}/cmake/scripts/FindVersion.cmake"
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         BYPRODUCTS ${GENERATED_SOURCE_FILES}
+)
 include(SourceList)
 include(Endian)
 add_endian_definition()
 # Needed by rev.cpp
 include_directories(${CMAKE_SOURCE_DIR}/src)
 # Needed by everything that uses Squirrel
 include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/squirrel/include)
 include(CompileFlags)
 compile_flags()
 add_executable(openttd WIN32 ${GENERATED_SOURCE_FILES})
 # All other files are added via target_sources()
 include(AddCustomXXXTimestamp)
 add_subdirectory(${CMAKE_SOURCE_DIR}/src)
 add_subdirectory(${CMAKE_SOURCE_DIR}/media/baseset)
 add_dependencies(openttd
     find_version)
 target_link_libraries(openttd
     openttd::languages
     openttd::settings
     openttd::basesets
     Threads::Threads
+)
 if (IPO_FOUND)
     set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE True)
     set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL True)
     set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO True)
 endif (IPO_FOUND)
 set_target_properties(openttd PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
 process_compile_flags()
 if (APPLE OR UNIX)
     add_definitions(-DUNIX)
 endif (APPLE OR UNIX)
 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(XDG_basedir)
 if (NOT OPTION_DEDICATED)
     link_package(Fluidsynth)
     link_package(SDL)
     link_package(SDL2)
     link_package(Allegro)
     link_package(FREETYPE TARGET Freetype::Freetype)
     link_package(Fontconfig TARGET Fontconfig::Fontconfig)
     link_package(ICU_lx)
     link_package(ICU_i18n)
 endif (NOT OPTION_DEDICATED)
 if (APPLE)
     link_package(Iconv TARGET Iconv::Iconv)
     target_link_libraries(openttd
         ${AUDIOTOOLBOX_LIBRARY}
         ${AUDIOUNIT_LIBRARY}
         ${COCOA_LIBRARY}
+    )
     add_definitions(
         -DWITH_COCOA
         -DENABLE_COCOA_QUARTZ
+    )
 endif (APPLE)
 if (NOT PERSONAL_DIR STREQUAL "(not set)")
     add_definitions(
         -DWITH_PERSONAL_DIR
         -DPERSONAL_DIR="${PERSONAL_DIR}"
+    )
 endif (NOT PERSONAL_DIR STREQUAL "(not set)")
 if (NOT SHARED_DIR STREQUAL "(not set)")
     add_definitions(
         -DWITH_SHARED_DIR
         -DSHARED_DIR="${SHARED_DIR}"
+    )
 endif (NOT SHARED_DIR STREQUAL "(not set)")
 if (NOT GLOBAL_DIR STREQUAL "(not set)")
     add_definitions(
         -DGLOBAL_DATA_DIR="${GLOBAL_DIR}"
+    )
 endif (NOT GLOBAL_DIR STREQUAL "(not set)")
 link_package(SSE)
 add_definitions_based_on_options()
 if (WIN32)
     add_definitions(
         -DUNICODE
         -D_UNICODE
         -DWITH_UNISCRIBE
+    )
     target_link_libraries(openttd
         ws2_32
         winmm
         imm32
+    )
 endif (WIN32)
 if (CMAKE_SIZEOF_VOID_P EQUAL 8)
     add_definitions(-D_SQ64)
 endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
 include(CreateRegression)
 create_regression()

cmake/AddCustomXXXTimestamp.cmake

➞

Show inline comments

@@ new file 100644 @@
 macro(_parse_arguments_with_multi_hack ORIGINAL_COMMAND_LINE)
     # cmake_parse_arguments() put all the MULTIS in a single variable; you
     # lose the ability to see for example multiple COMMANDs. To be able to
     # passthrough multiple MULTIS, we add a marker after every MULTI. This
     # allows us to reassemble the correct amount again before giving it to
     # the wrapped command with _reassemble_command_line().
     set(COMMAND_LINE "${ORIGINAL_COMMAND_LINE}")
     foreach(MULTI IN LISTS MULTIS)
         string(REPLACE "${MULTI}" "${MULTI};:::" COMMAND_LINE "${COMMAND_LINE}")
     endforeach(MULTI)
     cmake_parse_arguments(PARAM "${OPTIONS}" "${SINGLES}" "${MULTIS}" ${COMMAND_LINE})
 endmacro()
 macro(_reassemble_command_line)
     # Reassemble the command line as we original got it.
     set(NEW_COMMAND_LINE ${PARAM_UNPARSED_ARGUMENTS})
     foreach(OPTION IN LISTS OPTIONS)
         if (PARAM_${OPTION})
             list(APPEND NEW_COMMAND_LINE "${OPTION}")
         endif (PARAM_${OPTION})
     endforeach(OPTION)
     foreach(SINGLE IN LISTS SINGLES)
         if (PARAM_${SINGLE})
             list(APPEND NEW_COMMAND_LINE "${SINGLE}" "${PARAM_${SINGLE}}")
         endif (PARAM_${SINGLE})
     endforeach(SINGLE)
     foreach(MULTI IN LISTS MULTIS)
         if (PARAM_${MULTI})
             # Replace our special marker with the name of the MULTI again. This
             # restores for example multiple COMMANDs again.
             string(REPLACE ":::" "${MULTI}" PARAM_${MULTI} "${PARAM_${MULTI}}")
             list(APPEND NEW_COMMAND_LINE "${PARAM_${MULTI}}")
         endif (PARAM_${MULTI})
     endforeach(MULTI)
 endmacro()
 # Generated files can be older than their dependencies, causing useless
 # regenerations. This function replaces each file in OUTPUT with a .timestamp
 # file, adds a command to touch it and move the original file in BYPRODUCTS,
 # before calling add_custom_command().
+#
 # Note: Any add_custom_target() depending on files in original OUTPUT must use
 # add_custom_target_timestamp() instead to have the correct dependencies.
+#
 # add_custom_command_timestamp(OUTPUT output1 [output2 ...]
 #                       COMMAND command1 [ARGS] [args1...]
 #                       [COMMAND command2 [ARGS] [args2...] ...]
 #                       [MAIN_DEPENDENCY depend]
 #                       [DEPENDS [depends...]]
 #                       [BYPRODUCTS [files...]]
 #                       [IMPLICIT_DEPENDS <lang1> depend1
 #                                         [<lang2> depend2] ...]
 #                       [WORKING_DIRECTORY dir]
 #                       [COMMENT comment]
 #                       [VERBATIM] [APPEND] [USES_TERMINAL])
 function(add_custom_command_timestamp)
     set(OPTIONS VERBATIM APPEND USES_TERMINAL)
     set(SINGLES MAIN_DEPENDENCY WORKING_DIRECTORY COMMENT)
     set(MULTIS OUTPUT COMMAND DEPENDS BYPRODUCTS IMPLICIT_DEPENDS)
     _parse_arguments_with_multi_hack("${ARGN}")
     # Create a list of all the OUTPUTs (by removing our magic marker)
     string(REPLACE ":::;" "" OUTPUTS "${PARAM_OUTPUT}")
     # Reset the OUTPUT and BYPRODUCTS as an empty list (if needed).
     # Because they are MULTIS, we need to add our special marker here.
     set(PARAM_OUTPUT ":::")
     if (NOT PARAM_BYPRODUCTS)
         set(PARAM_BYPRODUCTS ":::")
     endif ()
     foreach(OUTPUT IN LISTS OUTPUTS)
         # For every output, we add a 'cmake -E touch' entry to update the
         # timestamp on each run.
         get_filename_component(OUTPUT_FILENAME ${OUTPUT} NAME)
         string(APPEND PARAM_COMMAND ";:::;${CMAKE_COMMAND};-E;touch;${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILENAME}.timestamp")
         # We change the OUTPUT to a '.timestamp' variant, and make the real
         # output a byproduct.
         list(APPEND PARAM_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILENAME}.timestamp)
         list(APPEND PARAM_BYPRODUCTS ${OUTPUT})
         # Mark this file as being a byproduct; we use this again with
         # add_custom_target_timestamp() to know if we should point to the
         # '.timestamp' variant or not.
         set_source_files_properties(${OUTPUT} PROPERTIES BYPRODUCT ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILENAME}.timestamp)
     endforeach(OUTPUT)
     # Reassemble and call the wrapped command
     _reassemble_command_line()
     add_custom_command(${NEW_COMMAND_LINE})
 endfunction(add_custom_command_timestamp)
 # Generated files can be older than their dependencies, causing useless
 # regenerations. This function adds a .timestamp file for each file in DEPENDS
 # replaced by add_custom_command_timestamp(), before calling add_custom_target().
+#
 # add_custom_target_timestamp(Name [ALL] [command1 [args1...]]
 #                      [COMMAND command2 [args2...] ...]
 #                      [DEPENDS depend depend depend ... ]
 #                      [BYPRODUCTS [files...]]
 #                      [WORKING_DIRECTORY dir]
 #                      [COMMENT comment]
 #                      [VERBATIM] [USES_TERMINAL]
 #                      [SOURCES src1 [src2...]])
 function(add_custom_target_timestamp)
     set(OPTIONS VERBATIM USES_TERMINAL)
     set(SINGLES WORKING_DIRECTORY COMMENT)
     set(MULTIS COMMAND DEPENDS BYPRODUCTS SOURCES)
     # ALL is missing, as the order is important here. It will be picked up
     # by ${PARAM_UNPARSED_ARGUMENTS} when reassembling the command line.
     _parse_arguments_with_multi_hack("${ARGN}")
     # Create a list of all the DEPENDs (by removing our magic marker)
     string(REPLACE ":::;" "" DEPENDS "${PARAM_DEPENDS}")
     # Reset the DEPEND as an empty list.
     # Because it is a MULTI, we need to add our special marker here.
     set(PARAM_DEPENDS ":::")
     foreach(DEPEND IN LISTS DEPENDS)
         # Check if the output is produced by add_custom_command_timestamp()
         get_source_file_property(BYPRODUCT ${DEPEND} BYPRODUCT)
         if (BYPRODUCT STREQUAL "NOTFOUND")
             # If it is not, just keep it as DEPEND
             list(APPEND PARAM_DEPENDS "${DEPEND}")
         else (BYPRODUCT STREQUAL "NOTFOUND")
             # If it is, the BYPRODUCT property points to the timestamp we want to depend on
             list(APPEND PARAM_DEPENDS "${BYPRODUCT}")
         endif (BYPRODUCT STREQUAL "NOTFOUND")
     endforeach(DEPEND)
     # Reassemble and call the wrapped command
     _reassemble_command_line()
     add_custom_target(${NEW_COMMAND_LINE})
 endfunction(add_custom_target_timestamp)

cmake/CompileFlags.cmake

➞

Show inline comments

@@ new file 100644 @@
 # Macro which contains all bits to setup the compile flags correctly.
+#
 # compile_flags()
+#
 macro(compile_flags)
     if (MSVC)
         # Switch to MT (static) instead of MD (dynamic) binary
         # For MSVC two generators are available
         # - a command line generator (Ninja) using CMAKE_BUILD_TYPE to specify the
         #   configuration of the build tree
         # - an IDE generator (Visual Studio) using CMAKE_CONFIGURATION_TYPES to
         #   specify all configurations that will be available in the generated solution
         list(APPEND MSVC_CONFIGS "${CMAKE_BUILD_TYPE}" "${CMAKE_CONFIGURATION_TYPES}")
         # Set usage of static runtime for all configurations
         foreach(MSVC_CONFIG ${MSVC_CONFIGS})
             string(TOUPPER "CMAKE_CXX_FLAGS_${MSVC_CONFIG}" MSVC_FLAGS)
             string(REPLACE "/MD" "/MT" ${MSVC_FLAGS} "${${MSVC_FLAGS}}")
         endforeach()
         # "If /Zc:rvalueCast is specified, the compiler follows section 5.4 of the
         # C++11 standard". We need C++11 for the way we use threads.
         add_compile_options(/Zc:rvalueCast)
         # Add DPI manifest to project; other WIN32 targets get this via ottdres.rc
         list(APPEND GENERATED_SOURCE_FILES "${CMAKE_SOURCE_DIR}/os/windows/openttd.manifest")
     endif (MSVC)
     # Add some -D flags for Debug builds. We cannot use add_definitions(), because
     # it does not appear to support the $<> tags.
     add_compile_options(
         "$<$<CONFIG:Debug>:-D_DEBUG>"
         "$<$<CONFIG:Debug>:-D_FORTIFY_SOURCE=2>"
+    )
     # Prepare a generator that checks if we are not a debug, and don't have asserts
     # on. We need this later on to set some compile options for stable releases.
     set(IS_STABLE_RELEASE "$<AND:$<NOT:$<CONFIG:Debug>>,$<NOT:$<BOOL:${OPTION_USE_ASSERTS}>>>")
     if (MSVC)
         add_compile_options(/W3)
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
         add_compile_options(
             -W
             -Wall
             -Wcast-qual
             -Wextra
             -Wsign-compare
             -Wundef
             -Wpointer-arith
             -Wwrite-strings
             -Wredundant-decls
             -Wformat-security
             -Wformat=2
             -Winit-self
             -Wnon-virtual-dtor
             # Often parameters are unused, which is fine.
             -Wno-unused-parameter
             # We use 'ABCD' multichar for SaveLoad chunks identifiers
             -Wno-multichar
             # Compilers complains about that we break strict-aliasing.
             #  On most places we don't see how to fix it, and it doesn't
             #  break anything. So disable strict-aliasing to make the
             #  compiler all happy.
             -fno-strict-aliasing
+        )
         add_compile_options(
             # When we are a stable release (Release build + USE_ASSERTS not set),
             # assertations are off, which trigger a lot of warnings. We disable
             # these warnings for these releases.
             "$<${IS_STABLE_RELEASE}:-Wno-unused-variable>"
             "$<${IS_STABLE_RELEASE}:-Wno-unused-but-set-parameter>"
             "$<${IS_STABLE_RELEASE}:-Wno-unused-but-set-variable>"
+        )
         if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
             include(CheckCXXCompilerFlag)
             check_cxx_compiler_flag("-flifetime-dse=1" LIFETIME_DSE_FOUND)
             add_compile_options(
                 # GCC 4.2+ automatically assumes that signed overflows do
                 # not occur in signed arithmetics, whereas we are not
                 # sure that they will not happen. It furthermore complains
                 # about its own optimized code in some places.
                 "-fno-strict-overflow"
                 # Prevent optimisation supposing enums are in a range specified by the standard
                 # For details, see http://gcc.gnu.org/PR43680
                 "-fno-tree-vrp"
                 # -flifetime-dse=2 (default since GCC 6) doesn't play
                 # well with our custom pool item allocator
                 "$<$<BOOL:${LIFETIME_DSE_FOUND}>:-flifetime-dse=1>"
+            )
         endif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
         add_compile_options(
             -Wall
             # warning #873: function ... ::operator new ... has no corresponding operator delete ...
             -wd873
             # warning #1292: unknown attribute "fallthrough"
             -wd1292
             # warning #1899: multicharacter character literal (potential portability problem)
             -wd1899
             # warning #2160: anonymous union qualifier is ignored
             -wd2160
+        )
     else ()
         message(FATAL_ERROR "No warning flags are set for this compiler yet; please consider creating a Pull Request to add support for this compiler.")
     endif ()
     if (NOT WIN32)
         # rdynamic is used to get useful stack traces from crash reports.
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
     endif (NOT WIN32)
 endmacro()

cmake/CreateGrfCommand.cmake

➞

Show inline comments

@@ new file 100644 @@
 # Macro which contains all bits and pieces to create a single grf file based
 # on NFO and PNG files.
+#
 # create_grf_command()
+#
 function(create_grf_command)
     set(EXTRA_PNG_SOURCE_FILES ${ARGV})
     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)
         get_filename_component(GRF_PNG_SOURCE_FILE_NAME "${GRF_PNG_SOURCE_FILE}" NAME)
         set(GRF_PNG_BINARY_FILE "${CMAKE_CURRENT_BINARY_DIR}/sprites/${GRF_PNG_SOURCE_FILE_NAME}")
         add_custom_command(OUTPUT ${GRF_PNG_BINARY_FILE}
                 COMMAND ${CMAKE_COMMAND} -E copy
                         ${GRF_PNG_SOURCE_FILE}
                         ${GRF_PNG_BINARY_FILE}
                 MAIN_DEPENDENCY ${GRF_PNG_SOURCE_FILE}
                 COMMENT "Copying ${GRF_PNG_SOURCE_FILE_NAME} sprite file"
+        )
         list(APPEND GRF_PNG_BINARY_FILES ${GRF_PNG_BINARY_FILE})
     endforeach(GRF_PNG_SOURCE_FILE)
     add_custom_command(OUTPUT ${GRF_BINARY_FILE}
             COMMAND ${CMAKE_COMMAND}
                     -DGRF_SOURCE_FOLDER=${CMAKE_CURRENT_SOURCE_DIR}
                     -DGRF_BINARY_FILE=${GRF_BINARY_FILE}
                     -DNFORENUM_EXECUTABLE=${NFORENUM_EXECUTABLE}
                     -DGRFCODEC_EXECUTABLE=${GRFCODEC_EXECUTABLE}
                     -P ${CMAKE_SOURCE_DIR}/cmake/scripts/CreateGRF.cmake
             MAIN_DEPENDENCY ${GRF_NFO_SOURCE_FILES}
             DEPENDS ${GRF_PNG_BINARY_FILES}
                     ${CMAKE_SOURCE_DIR}/cmake/scripts/CreateGRF.cmake
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
             COMMENT "Generating ${GRF_SOURCE_FOLDER_NAME}.grf"
+    )
     # For conviance, if you want to only test building the GRF
     add_custom_target(${GRF_SOURCE_FOLDER_NAME}.grf
             DEPENDS
             ${GRF_BINARY_FILE}
+    )
 endfunction()

cmake/CreateRegression.cmake

➞

Show inline comments

@@ new file 100644 @@
 # Macro which contains all bits and pieces to create the regression tests.
 # This creates both a standalone target 'regression', and it integrates with
 # 'ctest'. The first is prefered, as it is more verbose, and takes care of
 # dependencies correctly.
+#
 # create_regression()
+#
 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/*)
     foreach(REGRESSION_SOURCE_FILE IN LISTS REGRESSION_SOURCE_FILES)
         string(REGEX REPLACE "^${CMAKE_SOURCE_DIR}/regression/" "${CMAKE_BINARY_DIR}/ai/" REGRESSION_BINARY_FILE "${REGRESSION_SOURCE_FILE}")
         string(REGEX REPLACE "^${CMAKE_SOURCE_DIR}/regression/" "" REGRESSION_SOURCE_FILE_NAME "${REGRESSION_SOURCE_FILE}")
         if ("${REGRESSION_SOURCE_FILE_NAME}" STREQUAL "regression.cfg")
             continue()
         endif ("${REGRESSION_SOURCE_FILE_NAME}" STREQUAL "regression.cfg")
         add_custom_command(OUTPUT ${REGRESSION_BINARY_FILE}
                 COMMAND ${CMAKE_COMMAND} -E copy
                         ${REGRESSION_SOURCE_FILE}
                         ${REGRESSION_BINARY_FILE}
                 MAIN_DEPENDENCY ${REGRESSION_SOURCE_FILE}
                 COMMENT "Copying ${REGRESSION_SOURCE_FILE_NAME} regression file"
+        )
         list(APPEND REGRESSION_BINARY_FILES ${REGRESSION_BINARY_FILE})
     endforeach(REGRESSION_SOURCE_FILE)
     # 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)
     # 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
             DEPENDS
             ${REGRESSION_BINARY_FILES}
+    )
     enable_testing()
     # 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)
         if ("${REGRESSION_TEST_NAME}" STREQUAL "regression.cfg")
             continue()
         endif ("${REGRESSION_TEST_NAME}" STREQUAL "regression.cfg")
         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(REGRESSION_TEST)
     # Create a new target which runs the regression
     add_custom_target(regression
             DEPENDS ${REGRESSION_TARGETS})
 endmacro()

cmake/Endian.cmake

➞

Show inline comments

@@ new file 100644 @@
 # Add the definitions to indicate which endian we are building for.
+#
 # add_endian_definition()
+#
 function(add_endian_definition)
     include(TestBigEndian)
     TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
     if (IS_BIG_ENDIAN)
         add_definitions(-DTTD_ENDIAN=TTD_BIG_ENDIAN)
     else (IS_BIG_ENDIAN)
         add_definitions(-DTTD_ENDIAN=TTD_LITTLE_ENDIAN)
     endif (IS_BIG_ENDIAN)
 endfunction()

cmake/FindAllegro.cmake

➞

Show inline comments

@@ new file 100644 @@
 #[=======================================================================[.rst:
 FindAllegro
 -------
 Finds the allegro library.
 Result Variables
 ^^^^^^^^^^^^^^^^
 This will define the following variables:
 ``Allegro_FOUND``
   True if the system has the allegro library.
 ``Allegro_INCLUDE_DIRS``
   Include directories needed to use allegro.
 ``Allegro_LIBRARIES``
   Libraries needed to link to allegro.
 ``Allegro_VERSION``
   The version of the allegro library which was found.
 Cache Variables
 ^^^^^^^^^^^^^^^
 The following cache variables may also be set:
 ``Allegro_INCLUDE_DIR``
   The directory containing ``allegro.h``.
 ``Allegro_LIBRARY``
   The path to the allegro library.
 #]=======================================================================]
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_Allegro QUIET allegro)
 find_path(Allegro_INCLUDE_DIR
     NAMES allegro.h
     PATHS ${PC_Allegro_INCLUDE_DIRS}
+)
 find_library(Allegro_LIBRARY
     NAMES alleg
     PATHS ${PC_Allegro_LIBRARY_DIRS}
+)
 set(Allegro_VERSION ${PC_Allegro_VERSION})
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Allegro
     FOUND_VAR Allegro_FOUND
     REQUIRED_VARS
         Allegro_LIBRARY
         Allegro_INCLUDE_DIR
     VERSION_VAR Allegro_VERSION
+)
 if (Allegro_FOUND)
     set(Allegro_LIBRARIES ${Allegro_LIBRARY})
     set(Allegro_INCLUDE_DIRS ${Allegro_INCLUDE_DIR})
 endif ()
 mark_as_advanced(
     Allegro_INCLUDE_DIR
     Allegro_LIBRARY
+)

cmake/FindEditbin.cmake

➞

Show inline comments

@@ new file 100644 @@
 # Autodetect editbin. Only useful for MSVC.
 get_filename_component(MSVC_COMPILE_DIRECTORY ${CMAKE_CXX_COMPILER} DIRECTORY)
 find_program(
     EDITBIN_EXECUTABLE editbin.exe
     HINTS ${MSVC_COMPILE_DIRECTORY}
+)
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Editbin
     FOUND_VAR EDITBIN_FOUND
     REQUIRED_VARS EDITBIN_EXECUTABLE
+)

cmake/FindFluidsynth.cmake

➞

Show inline comments

@@ new file 100644 @@
 #[=======================================================================[.rst:
 FindFluidsynth
 -------
 Finds the fluidsynth library.
 Result Variables
 ^^^^^^^^^^^^^^^^
 This will define the following variables:
 ``Fluidsynth_FOUND``
   True if the system has the fluidsynth library.
 ``Fluidsynth_INCLUDE_DIRS``
   Include directories needed to use fluidsynth.
 ``Fluidsynth_LIBRARIES``
   Libraries needed to link to fluidsynth.
 ``Fluidsynth_VERSION``
   The version of the fluidsynth library which was found.
 Cache Variables
 ^^^^^^^^^^^^^^^
 The following cache variables may also be set:
 ``Fluidsynth_INCLUDE_DIR``
   The directory containing ``fluidsynth.h``.
 ``Fluidsynth_LIBRARY``
   The path to the fluidsynth library.
 #]=======================================================================]
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_Fluidsynth QUIET fluidsynth)
 find_path(Fluidsynth_INCLUDE_DIR
     NAMES fluidsynth.h
     PATHS ${PC_Fluidsynth_INCLUDE_DIRS}
+)
 find_library(Fluidsynth_LIBRARY
     NAMES fluidsynth
     PATHS ${PC_Fluidsynth_LIBRARY_DIRS}
+)
 set(Fluidsynth_VERSION ${PC_Fluidsynth_VERSION})
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Fluidsynth
     FOUND_VAR Fluidsynth_FOUND
     REQUIRED_VARS
         Fluidsynth_LIBRARY
         Fluidsynth_INCLUDE_DIR
     VERSION_VAR Fluidsynth_VERSION
+)
 if (Fluidsynth_FOUND)
     set(Fluidsynth_LIBRARIES ${Fluidsynth_LIBRARY})
     set(Fluidsynth_INCLUDE_DIRS ${Fluidsynth_INCLUDE_DIR})
 endif ()
 mark_as_advanced(
     Fluidsynth_INCLUDE_DIR
     Fluidsynth_LIBRARY
+)

cmake/FindFontconfig.cmake

➞

Show inline comments

@@ new file 100644 @@
 # Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 # file Copyright.txt or https://cmake.org/licensing for details.
 #[=======================================================================[.rst:
 FindFontconfig
 --------------
 Find Fontconfig headers and library.
 Imported Targets
 ^^^^^^^^^^^^^^^^
 ``Fontconfig::Fontconfig``
   The Fontconfig library, if found.
 Result Variables
 ^^^^^^^^^^^^^^^^
 This will define the following variables in your project:
 ``Fontconfig_FOUND``
   true if (the requested version of) Fontconfig is available.
 ``Fontconfig_VERSION``
   the version of Fontconfig.
 ``Fontconfig_LIBRARIES``
   the libraries to link against to use Fontconfig.
 ``Fontconfig_INCLUDE_DIRS``
   where to find the Fontconfig headers.
 ``Fontconfig_COMPILE_OPTIONS``
   this should be passed to target_compile_options(), if the
   target is not used for linking
 #]=======================================================================]
 # use pkg-config to get the directories and then use these values
 # in the FIND_PATH() and FIND_LIBRARY() calls
 find_package(PkgConfig QUIET)
 pkg_check_modules(PKG_FONTCONFIG QUIET fontconfig)
 set(Fontconfig_COMPILE_OPTIONS ${PKG_FONTCONFIG_CFLAGS_OTHER})
 set(Fontconfig_VERSION ${PKG_FONTCONFIG_VERSION})
 find_path( Fontconfig_INCLUDE_DIR
   NAMES
     fontconfig/fontconfig.h
   HINTS
     ${PKG_FONTCONFIG_INCLUDE_DIRS}
     /usr/X11/include
+)
 find_library( Fontconfig_LIBRARY
   NAMES
     fontconfig
   PATHS
     ${PKG_FONTCONFIG_LIBRARY_DIRS}
+)
 if (Fontconfig_INCLUDE_DIR AND NOT Fontconfig_VERSION)
   file(STRINGS ${Fontconfig_INCLUDE_DIR}/fontconfig/fontconfig.h _contents REGEX "^#define[ \t]+FC_[A-Z]+[ \t]+[0-9]+$")
   unset(Fontconfig_VERSION)
   foreach(VPART MAJOR MINOR REVISION)
     foreach(VLINE ${_contents})
       if(VLINE MATCHES "^#define[\t ]+FC_${VPART}[\t ]+([0-9]+)$")
         set(Fontconfig_VERSION_PART "${CMAKE_MATCH_1}")
         if(Fontconfig_VERSION)
           string(APPEND Fontconfig_VERSION ".${Fontconfig_VERSION_PART}")
         else()
           set(Fontconfig_VERSION "${Fontconfig_VERSION_PART}")
         endif()
       endif()
     endforeach()
   endforeach()
 endif ()
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Fontconfig
   FOUND_VAR
     Fontconfig_FOUND
   REQUIRED_VARS
     Fontconfig_LIBRARY
     Fontconfig_INCLUDE_DIR
   VERSION_VAR
     Fontconfig_VERSION
+)
 if(Fontconfig_FOUND AND NOT TARGET Fontconfig::Fontconfig)
   add_library(Fontconfig::Fontconfig UNKNOWN IMPORTED)
   set_target_properties(Fontconfig::Fontconfig PROPERTIES
     IMPORTED_LOCATION "${Fontconfig_LIBRARY}"
     INTERFACE_COMPILE_OPTIONS "${Fontconfig_COMPILE_OPTIONS}"
     INTERFACE_INCLUDE_DIRECTORIES "${Fontconfig_INCLUDE_DIR}"
+  )
 endif()
 mark_as_advanced(Fontconfig_LIBRARY Fontconfig_INCLUDE_DIR)
 if(Fontconfig_FOUND)
   set(Fontconfig_LIBRARIES ${Fontconfig_LIBRARY})
   set(Fontconfig_INCLUDE_DIRS ${Fontconfig_INCLUDE_DIR})
 endif()

cmake/FindGrfcodec.cmake

➞

Show inline comments

@@ new file 100644 @@
 # Autodetect grfcodec and nforenum.
+#
 find_program(GRFCODEC_EXECUTABLE grfcodec)
 find_program(NFORENUM_EXECUTABLE nforenum)
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Grfcodec
     FOUND_VAR GRFCODEC_FOUND
     REQUIRED_VARS
         GRFCODEC_EXECUTABLE
         NFORENUM_EXECUTABLE
+)

cmake/FindICU.cmake

➞

Show inline comments

@@ new file 100644 @@
 #[=======================================================================[.rst:
 FindICU
 -------
 Finds components of the ICU library.
 Accepted components are: uc, i18n, le, lx, io
 Result Variables
 ^^^^^^^^^^^^^^^^
 This will define the following variables:
 ``ICU_FOUND``
   True if components of ICU library are found.
 ``ICU_VERSION``
   The version of the ICU library which was found.
 ``ICU_<c>_FOUND``
   True if the system has the <c> component of ICU library.
 ``ICU_<c>_INCLUDE_DIRS``
   Include directories needed to use the <c> component of ICU library.
 ``ICU_<c>_LIBRARIES``
   Libraries needed to link to the <c> component of ICU library.
 #]=======================================================================]
 find_package(PkgConfig QUIET)
 set(ICU_KNOWN_COMPONENTS "uc" "i18n" "le" "lx" "io")
 foreach(MOD_NAME IN LISTS ICU_FIND_COMPONENTS)
     if (NOT MOD_NAME IN_LIST ICU_KNOWN_COMPONENTS)
         message(FATAL_ERROR "Unknown ICU component: ${MOD_NAME}")
     endif()
     pkg_check_modules(PC_ICU_${MOD_NAME} QUIET icu-${MOD_NAME})
     # Check the libraries returned by pkg-config really exist.
     unset(PC_LIBRARIES)
     foreach(LIBRARY IN LISTS PC_ICU_${MOD_NAME}_LIBRARIES)
         unset(PC_LIBRARY CACHE)
         find_library(PC_LIBRARY NAMES ${LIBRARY})
         if (NOT PC_LIBRARY)
             unset(PC_ICU_${MOD_NAME}_FOUND)
         endif()
         list(APPEND PC_LIBRARIES ${PC_LIBRARY})
     endforeach()
     unset(PC_LIBRARY CACHE)
     if (${PC_ICU_${MOD_NAME}_FOUND})
         set(ICU_COMPONENT_FOUND TRUE)
         set(ICU_${MOD_NAME}_FOUND TRUE)
         set(ICU_${MOD_NAME}_LIBRARIES ${PC_LIBRARIES})
         set(ICU_${MOD_NAME}_INCLUDE_DIRS ${PC_ICU_${MOD_NAME}_INCLUDE_DIRS})
         set(ICU_VERSION ${PC_ICU_${MOD_NAME}_VERSION})
     endif()
 endforeach()
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(ICU
     FOUND_VAR ICU_FOUND
     REQUIRED_VARS ICU_COMPONENT_FOUND
     VERSION_VAR ICU_VERSION
     HANDLE_COMPONENTS
+)

cmake/FindIconv.cmake

➞

Show inline comments

@@ new file 100644 @@
 # Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 # file Copyright.txt or https://cmake.org/licensing for details.
 #[=======================================================================[.rst:
 FindIconv
 ---------
 This module finds the ``iconv()`` POSIX.1 functions on the system.
 These functions might be provided in the regular C library or externally
 in the form of an additional library.
 The following variables are provided to indicate iconv support:
 .. variable:: Iconv_FOUND
   Variable indicating if the iconv support was found.
 .. variable:: Iconv_INCLUDE_DIRS
   The directories containing the iconv headers.
 .. variable:: Iconv_LIBRARIES
   The iconv libraries to be linked.
 .. variable:: Iconv_IS_BUILT_IN
   A variable indicating whether iconv support is stemming from the
   C library or not. Even if the C library provides `iconv()`, the presence of
   an external `libiconv` implementation might lead to this being false.
 Additionally, the following :prop_tgt:`IMPORTED` target is being provided:
 .. variable:: Iconv::Iconv
   Imported target for using iconv.
 The following cache variables may also be set:
 .. variable:: Iconv_INCLUDE_DIR
   The directory containing the iconv headers.
 .. variable:: Iconv_LIBRARY
   The iconv library (if not implicitly given in the C library).
 .. note::
   On POSIX platforms, iconv might be part of the C library and the cache
   variables ``Iconv_INCLUDE_DIR`` and ``Iconv_LIBRARY`` might be empty.
 #]=======================================================================]
 include(CMakePushCheckState)
 if(CMAKE_C_COMPILER_LOADED)
   include(CheckCSourceCompiles)
 elseif(CMAKE_CXX_COMPILER_LOADED)
   include(CheckCXXSourceCompiles)
 else()
   # If neither C nor CXX are loaded, implicit iconv makes no sense.
   set(Iconv_IS_BUILT_IN FALSE)
 endif()
 # iconv can only be provided in libc on a POSIX system.
 # If any cache variable is already set, we'll skip this test.
 if(NOT DEFINED Iconv_IS_BUILT_IN)
   if(UNIX AND NOT DEFINED Iconv_INCLUDE_DIR AND NOT DEFINED Iconv_LIBRARY)
     cmake_push_check_state(RESET)
     # We always suppress the message here: Otherwise on supported systems
     # not having iconv in their C library (e.g. those using libiconv)
     # would always display a confusing "Looking for iconv - not found" message
     set(CMAKE_FIND_QUIETLY TRUE)
     # The following code will not work, but it's sufficient to see if it compiles.
     # Note: libiconv will define the iconv functions as macros, so CheckSymbolExists
     # will not yield correct results.
     set(Iconv_IMPLICIT_TEST_CODE
+      "
       #include <stddef.h>
       #include <iconv.h>
       int main() {
         char *a, *b;
         size_t i, j;
         iconv_t ic;
         ic = iconv_open(\"to\", \"from\");
         iconv(ic, &a, &i, &b, &j);
         iconv_close(ic);
+      }
+      "
+    )
     if(CMAKE_C_COMPILER_LOADED)
       check_c_source_compiles("${Iconv_IMPLICIT_TEST_CODE}" Iconv_IS_BUILT_IN)
     else()
       check_cxx_source_compiles("${Iconv_IMPLICIT_TEST_CODE}" Iconv_IS_BUILT_IN)
     endif()
     cmake_pop_check_state()
   else()
     set(Iconv_IS_BUILT_IN FALSE)
   endif()
 endif()
 if(NOT Iconv_IS_BUILT_IN)
   find_path(Iconv_INCLUDE_DIR
     NAMES "iconv.h"
     DOC "iconv include directory")
   set(Iconv_LIBRARY_NAMES "iconv" "libiconv")
 else()
   set(Iconv_INCLUDE_DIR "" CACHE FILEPATH "iconv include directory")
   set(Iconv_LIBRARY_NAMES "c")
 endif()
 find_library(Iconv_LIBRARY
   NAMES ${Iconv_LIBRARY_NAMES}
   DOC "iconv library (potentially the C library)")
 mark_as_advanced(Iconv_INCLUDE_DIR)
 mark_as_advanced(Iconv_LIBRARY)
 include(FindPackageHandleStandardArgs)
 if(NOT Iconv_IS_BUILT_IN)
   find_package_handle_standard_args(Iconv REQUIRED_VARS Iconv_LIBRARY Iconv_INCLUDE_DIR)
 else()
   find_package_handle_standard_args(Iconv REQUIRED_VARS Iconv_LIBRARY)
 endif()
 if(Iconv_FOUND)
   set(Iconv_INCLUDE_DIRS "${Iconv_INCLUDE_DIR}")
   set(Iconv_LIBRARIES "${Iconv_LIBRARY}")
   if(NOT TARGET Iconv::Iconv)
     add_library(Iconv::Iconv INTERFACE IMPORTED)
   endif()
   set_property(TARGET Iconv::Iconv PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${Iconv_INCLUDE_DIRS}")
   set_property(TARGET Iconv::Iconv PROPERTY INTERFACE_LINK_LIBRARIES "${Iconv_LIBRARIES}")
 endif()

cmake/FindLZO.cmake

➞

Show inline comments

@@ new file 100644 @@
 #[=======================================================================[.rst:
 FindLZO
 -------
 Finds the LZO library.
 Result Variables
 ^^^^^^^^^^^^^^^^
 This will define the following variables:
 ``LZO_FOUND``
   True if the system has the LZO library.
 ``LZO_INCLUDE_DIRS``
   Include directories needed to use LZO.
 ``LZO_LIBRARIES``
   Libraries needed to link to LZO.
 ``LZO_VERSION``
   The version of the LZO library which was found.
 Cache Variables
 ^^^^^^^^^^^^^^^
 The following cache variables may also be set:
 ``LZO_INCLUDE_DIR``
   The directory containing ``lzo/lzo1x.h``.
 ``LZO_LIBRARY``
   The path to the LZO library.
 #]=======================================================================]
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_LZO QUIET lzo2)
 find_path(LZO_INCLUDE_DIR
     NAMES lzo/lzo1x.h
     PATHS ${PC_LZO_INCLUDE_DIRS}
+)
 find_library(LZO_LIBRARY
     NAMES lzo2
     PATHS ${PC_LZO_LIBRARY_DIRS}
+)
 # With vcpkg, the library path should contain both 'debug' and 'optimized'
 # entries (see target_link_libraries() documentation for more information)
+#
 # NOTE: we only patch up when using vcpkg; the same issue might happen
 # when not using vcpkg, but this is non-trivial to fix, as we have no idea
 # what the paths are. With vcpkg we do. And we only official support vcpkg
 # with Windows.
+#
 # NOTE: this is based on the assumption that the debug file has the same
 # name as the optimized file. This is not always the case, but so far
 # experiences has shown that in those case vcpkg CMake files do the right
 # thing.
 if (VCPKG_TOOLCHAIN AND LZO_LIBRARY)
     if (LZO_LIBRARY MATCHES "/debug/")
         set(LZO_LIBRARY_DEBUG ${LZO_LIBRARY})
         string(REPLACE "/debug/lib/" "/lib/" LZO_LIBRARY_RELEASE ${LZO_LIBRARY})
     else()
         set(LZO_LIBRARY_RELEASE ${LZO_LIBRARY})
         string(REPLACE "/lib/" "/debug/lib/" LZO_LIBRARY_DEBUG ${LZO_LIBRARY})
     endif()
     include(SelectLibraryConfigurations)
     select_library_configurations(LZO)
 endif()
 set(LZO_VERSION ${PC_LZO_VERSION})
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LZO
     FOUND_VAR LZO_FOUND
     REQUIRED_VARS
         LZO_LIBRARY
         LZO_INCLUDE_DIR
     VERSION_VAR LZO_VERSION
+)
 if (LZO_FOUND)
     set(LZO_LIBRARIES ${LZO_LIBRARY})
     set(LZO_INCLUDE_DIRS ${LZO_INCLUDE_DIR})
 endif ()
 mark_as_advanced(
     LZO_INCLUDE_DIR
     LZO_LIBRARY
+)

cmake/FindSSE.cmake

➞

Show inline comments

@@ new file 100644 @@
 # Autodetect if SSE4.1 can be used. If so, the assumption is, so can the other
 # SSE version (SSE 2.0, SSSE 3.0).
 include(CheckCXXSourceCompiles)
 set(CMAKE_REQUIRED_FLAGS "")
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     set(CMAKE_REQUIRED_FLAGS "-msse4.1")
 endif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
 check_cxx_source_compiles("
     #include <xmmintrin.h>
     #include <smmintrin.h>
     #include <tmmintrin.h>
     int main() { return 0; }"
     SSE_FOUND
+)

cmake/FindXDG_basedir.cmake

➞

Show inline comments

@@ new file 100644 @@
 #[=======================================================================[.rst:
 FindXDG_basedir
 -------
 Finds the xdg-basedir library.
 Result Variables
 ^^^^^^^^^^^^^^^^
 This will define the following variables:
 ``XDG_basedir_FOUND``
   True if the system has the xdg-basedir library.
 ``XDG_basedir_INCLUDE_DIRS``
   Include directories needed to use xdg-basedir.
 ``XDG_basedir_LIBRARIES``
   Libraries needed to link to xdg-basedir.
 ``XDG_basedir_VERSION``
   The version of the xdg-basedir library which was found.
 Cache Variables
 ^^^^^^^^^^^^^^^
 The following cache variables may also be set:
 ``XDG_basedir_INCLUDE_DIR``
   The directory containing ``xdg-basedir.h``.
 ``XDG_basedir_LIBRARY``
   The path to the xdg-basedir library.
 #]=======================================================================]
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_XDG_basedir QUIET libxdg-basedir)
 find_path(XDG_basedir_INCLUDE_DIR
     NAMES basedir.h
     PATHS ${PC_XDG_basedir_INCLUDE_DIRS}
+)
 find_library(XDG_basedir_LIBRARY
     NAMES xdg-basedir
     PATHS ${PC_XDG_basedir_LIBRARY_DIRS}
+)
 set(XDG_basedir_VERSION ${PC_XDG_basedir_VERSION})
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(XDG_basedir
     FOUND_VAR XDG_basedir_FOUND
     REQUIRED_VARS
         XDG_basedir_LIBRARY
         XDG_basedir_INCLUDE_DIR
     VERSION_VAR XDG_basedir_VERSION
+)
 if (XDG_basedir_FOUND)
     set(XDG_basedir_LIBRARIES ${XDG_basedir_LIBRARY})
     set(XDG_basedir_INCLUDE_DIRS ${XDG_basedir_INCLUDE_DIR})
 endif ()
 mark_as_advanced(
     XDG_basedir_INCLUDE_DIR
     XDG_basedir_LIBRARY
+)

cmake/FindXaudio2.cmake

➞

Show inline comments

@@ new file 100644 @@
 # Autodetect if xaudio2 can be used.
 include(CheckCXXSourceCompiles)
 set(CMAKE_REQUIRED_FLAGS "")
 check_cxx_source_compiles("
     #include <windows.h>
     #undef NTDDI_VERSION
     #undef _WIN32_WINNT
     #define NTDDI_VERSION    NTDDI_WIN8
     #define _WIN32_WINNT     _WIN32_WINNT_WIN8
     #include <xaudio2.h>
     int main() { return 0; }"
     XAUDIO2_FOUND
+)

cmake/LinkPackage.cmake

➞

Show inline comments

@@ new file 100644 @@
 function(link_package NAME)
     cmake_parse_arguments(LP "ENCOURAGED" "TARGET" "" ${ARGN})
     if (${NAME}_FOUND)
         string(TOUPPER "${NAME}" UCNAME)
         add_definitions(-DWITH_${UCNAME})
         if (LP_TARGET AND TARGET ${LP_TARGET})
             target_link_libraries(openttd ${LP_TARGET})
             message(STATUS "${NAME} found -- -DWITH_${UCNAME} -- ${LP_TARGET}")
         else()
             include_directories(${${NAME}_INCLUDE_DIRS} ${${NAME}_INCLUDE_DIR})
             target_link_libraries(openttd ${${NAME}_LIBRARIES} ${${NAME}_LIBRARY})
             message(STATUS "${NAME} found -- -DWITH_${UCNAME} -- ${${NAME}_INCLUDE_DIRS} ${${NAME}_INCLUDE_DIR} -- ${${NAME}_LIBRARIES} ${${NAME}_LIBRARY}")
         endif()
     elseif (LP_ENCOURAGED)
         message(WARNING "${NAME} not found; compiling OpenTTD without ${NAME} is strongly disencouraged")
     endif()
 endfunction()

cmake/Options.cmake

➞

Show inline comments

@@ new file 100644 @@
 # Set the options for the directories (personal, shared, global).
+#
 # set_directory_options()
+#
 function(set_directory_options)
     if (APPLE)
         set(DEFAULT_PERSONAL_DIR "Documents/OpenTTD")
         set(DEFAULT_SHARED_DIR "/Library/Application Support/OpenTTD")
         set(DEFAULT_GLOBAL_DIR "(not set)")
     elseif (WIN32)
         set(DEFAULT_PERSONAL_DIR "OpenTTD")
         set(DEFAULT_SHARED_DIR "(not set)")
         set(DEFAULT_GLOBAL_DIR "(not set)")
     elseif (UNIX)
         set(DEFAULT_PERSONAL_DIR ".openttd")
         set(DEFAULT_SHARED_DIR "(not set)")
         set(DEFAULT_GLOBAL_DIR "${CMAKE_INSTALL_PREFIX}/share/games/openttd")
     else ()
         message(FATAL_ERROR "Unknown OS found; please consider creating a Pull Request to add support for this OS.")
     endif ()
     if (NOT PERSONAL_DIR)
         set(PERSONAL_DIR "${DEFAULT_PERSONAL_DIR}" CACHE STRING "Personal directory")
         message(STATUS "Detecting Personal Data directory - ${PERSONAL_DIR}")
     endif (NOT PERSONAL_DIR)
     if (NOT SHARED_DIR)
         set(SHARED_DIR "${DEFAULT_SHARED_DIR}" CACHE STRING "Shared directory")
         message(STATUS "Detecting Shared Data directory - ${SHARED_DIR}")
     endif (NOT SHARED_DIR)
     if (NOT GLOBAL_DIR)
         set(GLOBAL_DIR "${DEFAULT_GLOBAL_DIR}" CACHE STRING "Global directory")
         message(STATUS "Detecting Global Data directory - ${GLOBAL_DIR}")
     endif (NOT GLOBAL_DIR)
 endfunction()
 # Set some generic options that influence what is being build.
+#
 # set_options()
+#
 function(set_options)
     if (UNIX AND NOT APPLE)
         set(DEFAULT_OPTION_INSTALL_FHS YES)
     else (UNIX AND NOT APPLE)
         set(DEFAULT_OPTION_INSTALL_FHS NO)
     endif (UNIX AND NOT APPLE)
     option(OPTION_DEDICATED "Build dedicated server only (no GUI)" NO)
     option(OPTION_INSTALL_FHS "Install with Filesstem Hierarchy Standard folders" ${DEFAULT_OPTION_INSTALL_FHS})
     option(OPTION_USE_ASSERTS "Use assertions; leave enabled for nightlies, betas, and RCs" YES)
     option(OPTION_USE_THREADS "Use threads" YES)
 endfunction()
 # Show the values of the generic options.
+#
 # show_options()
+#
 function(show_options)
     message(STATUS "Option Dedicated - ${OPTION_DEDICATED}")
     message(STATUS "Option Install FHS - ${OPTION_INSTALL_FHS}")
     message(STATUS "Option Use assert - ${OPTION_USE_ASSERTS}")
     message(STATUS "Option Use threads - ${OPTION_USE_THREADS}")
 endfunction()
 # Add the definitions for the options that are selected.
+#
 # add_definitions_based_on_options()
+#
 function(add_definitions_based_on_options)
     if (OPTION_DEDICATED)
         add_definitions(-DDEDICATED)
     endif (OPTION_DEDICATED)
     if (NOT OPTION_USE_THREADS)
         add_definitions(-DNO_THREADS)
     endif (NOT OPTION_USE_THREADS)
     if (OPTION_USE_ASSERTS)
         add_definitions(-DWITH_ASSERT)
     else (OPTION_USE_ASSERTS)
         add_definitions(-DNDEBUG)
     endif (OPTION_USE_ASSERTS)
 endfunction()

cmake/SourceList.cmake

➞

Show inline comments

@@ new file 100644 @@
 # Add a file to be compiled.
+#
 # add_files([file1 ...] CONDITION condition [condition ...])
+#
 # CONDITION is a complete statement that can be evaluated with if().
 # If it evaluates true, the source files will be added; otherwise not.
 # For example: ADD_IF SDL_FOUND AND Allegro_FOUND
+#
 function(add_files)
     cmake_parse_arguments(PARAM "" "" "CONDITION" ${ARGN})
     set(PARAM_FILES "${PARAM_UNPARSED_ARGUMENTS}")
     if (PARAM_CONDITION)
         if (NOT (${PARAM_CONDITION}))
             return()
         endif (NOT (${PARAM_CONDITION}))
     endif (PARAM_CONDITION)
     foreach(FILE IN LISTS PARAM_FILES)
         target_sources(openttd PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE})
     endforeach()
 endfunction(add_files)
 # This function works around an 'issue' with CMake, where
 # set_source_files_properties() only works in the scope of the file. We want
 # to set properties for the source file on a more global level. To solve this,
 # this function records the flags you want, and a macro adds them in the root
 # CMakeLists.txt.
 # See this URL for more information on the issue:
 # http://cmake.3232098.n2.nabble.com/scope-of-set-source-files-properties-td4766111.html
+#
 # set_compile_flags([file1 ...] COMPILE_FLAGS cflag [cflag ...])
+#
 function(set_compile_flags)
     cmake_parse_arguments(PARAM "" "" "COMPILE_FLAGS" ${ARGN})
     set(PARAM_FILES "${PARAM_UNPARSED_ARGUMENTS}")
     get_property(SOURCE_PROPERTIES GLOBAL PROPERTY source_properties)
     foreach(FILE IN LISTS PARAM_FILES)
         list(APPEND SOURCE_PROPERTIES "${CMAKE_CURRENT_SOURCE_DIR}/${FILE}::${PARAM_COMPILE_FLAGS}")
     endforeach()
     set_property(GLOBAL PROPERTY source_properties "${SOURCE_PROPERTIES}")
 endfunction(set_compile_flags)
 # Call this macro in the same CMakeLists.txt and after add_executable().
 # This makes sure all the COMPILE_FLAGS of set_compile_flags() are set
 # correctly.
+#
 # process_compile_flags()
+#
 function(process_compile_flags)
     get_property(SOURCE_PROPERTIES GLOBAL PROPERTY source_properties)
     foreach(ENTRY ${SOURCE_PROPERTIES})
         string(REPLACE "::" ";" ENTRY "${ENTRY}")
         list(GET ENTRY 0 FILE)
         list(GET ENTRY 1 PROPERTIES)
         set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS ${PROPERTIES})
     endforeach()
 endfunction(process_compile_flags)

cmake/Static.cmake

➞

Show inline comments

@@ new file 100644 @@
 # Set static linking if the platform requires it.
+#
 # set_static()
+#
 function(set_static_if_needed)
      if (MINGW)
         # Let exectutables run outside MinGW environment
         # Force searching static libs
         set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" PARENT_SCOPE)
         # Force static linking
         link_libraries(-static -static-libgcc -static-libstdc++)
     endif()
 endfunction()

cmake/scripts/FindVersion.cmake

➞

Show inline comments

@@ new file 100644 @@
 cmake_minimum_required(VERSION 3.5)
+#
 # Finds the current version of the current folder.
+#
 find_package(Git QUIET)
 # ${CMAKE_SOURCE_DIR}/.git may be a directory or a regular file
 if (GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
     # Make sure LC_ALL is set to something desirable
     set(SAVED_LC_ALL "$ENV{LC_ALL}")
     set(ENV{LC_ALL} C)
     # Assume the dir is not modified
     set(REV_MODIFIED 0)
     # Refresh the index to make sure file stat info is in sync, then look for modifications
     execute_process(COMMAND ${GIT_EXECUTABLE} update-index --refresh
                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                     OUTPUT_QUIET
+    )
     # See if git tree is modified
     execute_process(COMMAND ${GIT_EXECUTABLE} diff-index HEAD
                     OUTPUT_VARIABLE IS_MODIFIED
                     OUTPUT_STRIP_TRAILING_WHITESPACE
                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    )
     if (NOT IS_MODIFIED STREQUAL "")
         set(REV_MODIFIED 2)
     endif()
     # Get last commit hash
     execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --verify HEAD
                     OUTPUT_VARIABLE FULLHASH
                     OUTPUT_STRIP_TRAILING_WHITESPACE
                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                     ERROR_QUIET
+    )
     set(REV_HASH "${FULLHASH}")
     string(SUBSTRING "${FULLHASH}" 0 10 SHORTHASH)
     # Get the last commit date
     execute_process(COMMAND ${GIT_EXECUTABLE} show -s --pretty=format:%ci HEAD
                     OUTPUT_VARIABLE COMMITDATE
                     OUTPUT_STRIP_TRAILING_WHITESPACE
                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    )
     string(REGEX REPLACE "([0-9]+)-([0-9]+)-([0-9]+).*" "\\1\\2\\3" COMMITDATE "${COMMITDATE}")
     set(REV_ISODATE "${COMMITDATE}")
     string(SUBSTRING REV_ISODATE 1 4 REV_YEAR)
     # Get the branch
     execute_process(COMMAND ${GIT_EXECUTABLE} symbolic-ref -q HEAD
                     OUTPUT_VARIABLE BRANCH
                     OUTPUT_STRIP_TRAILING_WHITESPACE
                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                     ERROR_QUIET
+    )
     string(REGEX REPLACE ".*/" "" BRANCH "${BRANCH}")
     # Get the tag
     execute_process(COMMAND ${GIT_EXECUTABLE} name-rev --name-only --tags --no-undefined HEAD
                     OUTPUT_VARIABLE TAG
                     OUTPUT_STRIP_TRAILING_WHITESPACE
                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                     ERROR_QUIET
+    )
     string(REGEX REPLACE "\^0$" "" TAG "${TAG}")
     if (REV_MODIFIED EQUAL 0)
         set(HASHPREFIX "-g")
     elseif (REV_MODIFIED EQUAL 2)
         set(HASHPREFIX "-m")
     else ()
         set(HASHPREFIX "-u")
     endif()
     # Set the version string
     if (NOT TAG STREQUAL "")
         set(REV_VERSION "${TAG}")
         set(REV_ISTAG 1)
         string(REGEX REPLACE "^[0-9.]*$" "" STABLETAG "${TAG}")
         if (NOT STABLETAG STREQUAL "")
             set(REV_ISSTABLETAG 1)
         else ()
             set(REV_ISSTABLETAG 0)
         endif ()
     else ()
         set(REV_VERSION "${REV_ISODATE}-${BRANCH}${HASHPREFIX}${SHORTHASH}")
         set(REV_ISTAG 0)
         set(REV_ISSTABLETAG 0)
     endif ()
     # Restore LC_ALL
     set(ENV{LC_ALL} "${SAVED_LC_ALL}")
 elseif (EXISTS "${CMAKE_SOURCE_DIR}/.ottdrev")
     file(READ "${CMAKE_SOURCE_DIR}/.ottdrev" OTTDREV)
     string(REPLACE "\t" ";" OTTDREV "${OTTDREV}")
     list(GET OTTDREV 0 REV_VERSION)
     list(GET OTTDREV 1 REV_ISODATE)
     list(GET OTTDREV 2 REV_MODIFIED)
     list(GET OTTDREV 3 REV_HASH)
     list(GET OTTDREV 4 REV_ISTAG)
     list(GET OTTDREV 5 REV_ISSTABLETAG)
     list(GET OTTDREV 6 REV_YEAR)
 else ()
     message(WARNING "No version detected; this build will NOT be network compatible")
     set(REV_VERSION "norev0000")
     set(REV_ISODATE "19700101")
     set(REV_MODIFIED 1)
     set(REV_HASH "unknown")
     set(REV_ISTAG 0)
     set(REV_ISSTABLETAG 0)
     set(REV_YEAR "1970")
 endif ()
 message(STATUS "Version string: ${REV_VERSION}")
 message(STATUS "Generating rev.cpp")
 configure_file("${CMAKE_SOURCE_DIR}/src/rev.cpp.in"
         "${FIND_VERSION_BINARY_DIR}/rev.cpp")
 if (WIN32)
     message(STATUS "Generating ottdres.rc")
     configure_file("${CMAKE_SOURCE_DIR}/src/os/windows/ottdres.rc.in"
             "${FIND_VERSION_BINARY_DIR}/ottdres.rc")
 endif (WIN32)
 message(STATUS "Generating CPackProperties.cmake")
 configure_file("${CMAKE_SOURCE_DIR}/CPackProperties.cmake.in"
         "${CPACK_BINARY_DIR}/CPackProperties.cmake" @ONLY)

media/baseset/CMakeLists.txt

➞

Show inline comments

@@ @@ -20,13 +20,13 @@ set(BASESET_OTHER_SOURCE_FILES @@
+)
 # Done by the subdirectories, if nforenum / grfcodec is installed
-if (NFORENUM_FOUND AND GRFCODEC_FOUND)
 if (GRFCODEC_FOUND)
     set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/openttd.grf PROPERTIES GENERATED TRUE)
     set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/orig_extra.grf PROPERTIES GENERATED TRUE)
     list(APPEND BASESET_BINARY_FILES openttd.grf)
     list(APPEND BASESET_BINARY_FILES orig_extra.grf)
-endif (NFORENUM_FOUND AND GRFCODEC_FOUND)
 endif (GRFCODEC_FOUND)
 set(BASESET_EXTRAGRF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/orig_extra.grf)

media/baseset/openttd/CMakeLists.txt

➞

Show inline comments

@@ @@ -3,7 +3,7 @@ @@
 # This is mainly because not many people have both of these tools installed,
 # so it is cheaper to cache them in git, and only regenerate when you are
 # working on it / have the tools installed.
 if (NFORENUM_FOUND AND GRFCODEC_FOUND)
     include(CreateGrfCommand REQUIRED)
 if (GRFCODEC_FOUND)
     include(CreateGrfCommand)
     create_grf_command()
-endif (NFORENUM_FOUND AND GRFCODEC_FOUND)
 endif (GRFCODEC_FOUND)

media/baseset/orig_extra/CMakeLists.txt

➞

Show inline comments

@@ @@ -3,12 +3,12 @@ @@
 # This is mainly because not many people have both of these tools installed,
 # so it is cheaper to cache them in git, and only regenerate when you are
 # working on it / have the tools installed.
 if (NFORENUM_FOUND AND GRFCODEC_FOUND)
     include(CreateGrfCommand REQUIRED)
 if (GRFCODEC_FOUND)
     include(CreateGrfCommand)
     create_grf_command(
         # We share some files with 'openttd' grf
         ${CMAKE_CURRENT_SOURCE_DIR}/../openttd/airports.png
         ${CMAKE_CURRENT_SOURCE_DIR}/../openttd/canals.png
         ${CMAKE_CURRENT_SOURCE_DIR}/../openttd/chars.png
+    )
-endif (NFORENUM_FOUND AND GRFCODEC_FOUND)
 endif (GRFCODEC_FOUND)

os/windows/openttd.manifest

➞

Show inline comments

@@ new file 100644 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
     <security>
       <requestedPrivileges>
         <requestedExecutionLevel level="asInvoker" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
       <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">True/PM</dpiAware>
     </windowsSettings>
   </application>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <!--This Id value indicates the application supports Windows Vista functionality -->
       <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
       <!--This Id value indicates the application supports Windows 7 functionality-->
       <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
       <!--This Id value indicates the application supports Windows 8 functionality-->
       <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
       <!--This Id value indicates the application supports Windows 8.1 functionality-->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
       <!--This Id value indicates the application supports Windows 10 functionality-->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
     </application>
   </compatibility>
 </assembly>

src/3rdparty/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_subdirectory(md5)
 add_subdirectory(squirrel)
 add_subdirectory(os2)

src/3rdparty/md5/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     md5.cpp
     md5.h
+)

src/3rdparty/os2/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     getaddrinfo.c
     getaddrinfo.h
     getnameinfo.c
     getnameinfo.h
     CONDITION OPTION_OS2
+)

src/3rdparty/squirrel/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_subdirectory(include)
 add_subdirectory(sqstdlib)
 add_subdirectory(squirrel)

src/3rdparty/squirrel/include/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     sqstdaux.h
     sqstdmath.h
     sqstdstring.h
     squirrel.h
+)

src/3rdparty/squirrel/sqstdlib/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     sqstdaux.cpp
     sqstdmath.cpp
+)

src/3rdparty/squirrel/squirrel/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     sqapi.cpp
     sqarray.h
     sqbaselib.cpp
     sqclass.cpp
     sqclass.h
     sqclosure.h
     sqcompiler.cpp
     sqcompiler.h
     sqdebug.cpp
     sqfuncproto.h
     sqfuncstate.cpp
     sqfuncstate.h
     sqlexer.cpp
     sqlexer.h
     sqmem.cpp
     sqobject.cpp
     sqobject.h
     sqopcodes.h
     sqpcheader.h
     sqstate.cpp
     sqstate.h
     sqstring.h
     sqtable.cpp
     sqtable.h
     squserdata.h
     squtils.h
     sqvm.cpp
     sqvm.h
+)

src/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_subdirectory(3rdparty)
 add_subdirectory(ai)
 add_subdirectory(blitter)
 add_subdirectory(core)
 add_subdirectory(game)
 add_subdirectory(lang)
 add_subdirectory(linkgraph)
 add_subdirectory(misc)
 add_subdirectory(music)
 add_subdirectory(network)
 add_subdirectory(os)
 add_subdirectory(pathfinder)
 add_subdirectory(saveload)
 add_subdirectory(script)
 add_subdirectory(settingsgen)
 add_subdirectory(sound)
 add_subdirectory(spriteloader)
 add_subdirectory(strgen)
 add_subdirectory(table)
 add_subdirectory(video)
 add_subdirectory(widgets)
 add_files(
     viewport_sprite_sorter_sse4.cpp
     CONDITION SSE_FOUND
+)
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     set_compile_flags(
         viewport_sprite_sorter_sse4.cpp
         COMPILE_FLAGS -msse4.1)
 endif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
 add_files(
     aircraft.h
     aircraft_cmd.cpp
     aircraft_gui.cpp
     airport.cpp
     airport.h
     airport_gui.cpp
     animated_tile.cpp
     animated_tile_func.h
     articulated_vehicles.cpp
     articulated_vehicles.h
     autoreplace.cpp
     autoreplace_base.h
     autoreplace_cmd.cpp
     autoreplace_func.h
     autoreplace_gui.cpp
     autoreplace_gui.h
     autoreplace_type.h
     autoslope.h
     base_consist.cpp
     base_consist.h
     base_media_base.h
     base_media_func.h
     base_station_base.h
     bitmap_type.h
     bmp.cpp
     bmp.h
     bootstrap_gui.cpp
     bridge.h
     bridge_gui.cpp
     bridge_map.cpp
     bridge_map.h
     build_vehicle_gui.cpp
     cargo_type.h
     cargoaction.cpp
     cargoaction.h
     cargomonitor.cpp
     cargomonitor.h
     cargopacket.cpp
     cargopacket.h
     cargotype.cpp
     cargotype.h
     cheat.cpp
     cheat_func.h
     cheat_gui.cpp
     cheat_type.h
     clear_cmd.cpp
     clear_func.h
     clear_map.h
     cmd_helper.h
     command.cpp
     command_func.h
     command_type.h
     company_base.h
     company_cmd.cpp
     company_func.h
     company_gui.cpp
     company_gui.h
     company_manager_face.h
     company_type.h
     console.cpp
     console_cmds.cpp
     console_func.h
     console_gui.cpp
     console_gui.h
     console_internal.h
     console_type.h
     cpu.cpp
     cpu.h
     crashlog.cpp
     crashlog.h
     currency.cpp
     currency.h
     date.cpp
     date_func.h
     date_gui.cpp
     date_gui.h
     date_type.h
     debug.cpp
     debug.h
     dedicated.cpp
     depot.cpp
     depot_base.h
     depot_cmd.cpp
     depot_func.h
     depot_gui.cpp
     depot_map.h
     depot_type.h
     direction_func.h
     direction_type.h
     disaster_vehicle.cpp
     disaster_vehicle.h
     dock_gui.cpp
     driver.cpp
     driver.h
     economy.cpp
     economy_base.h
     economy_func.h
     economy_type.h
     effectvehicle.cpp
     effectvehicle_base.h
     effectvehicle_func.h
     elrail.cpp
     elrail_func.h
     engine.cpp
     engine_base.h
     engine_func.h
     engine_gui.cpp
     engine_gui.h
     engine_type.h
     error.h
     error_gui.cpp
     fileio.cpp
     fileio_func.h
     fileio_type.h
     fios.cpp
     fios.h
     fios_gui.cpp
     fontcache.cpp
     fontcache.h
     fontdetection.cpp
     fontdetection.h
     framerate_gui.cpp
     framerate_type.h
     gamelog.cpp
     gamelog.h
     gamelog_internal.h
     genworld.cpp
     genworld.h
     genworld_gui.cpp
     gfx.cpp
     gfx_func.h
     gfx_layout.cpp
     gfx_layout.h
     gfx_type.h
     gfxinit.cpp
     gfxinit.h
     goal.cpp
     goal_base.h
     goal_gui.cpp
     goal_type.h
     graph_gui.cpp
     graph_gui.h
     ground_vehicle.cpp
     ground_vehicle.hpp
     group.h
     group_cmd.cpp
     group_gui.cpp
     group_gui.h
     group_type.h
     gui.h
     guitimer_func.h
     heightmap.cpp
     heightmap.h
     highscore.cpp
     highscore.h
     highscore_gui.cpp
     hotkeys.cpp
     hotkeys.h
     house.h
     house_type.h
     industry.h
     industry_cmd.cpp
     industry_gui.cpp
     industry_map.h
     industry_type.h
     industrytype.h
     ini.cpp
     ini_load.cpp
     ini_type.h
     intro_gui.cpp
     landscape.cpp
     landscape.h
     landscape_type.h
     language.h
     livery.h
     main_gui.cpp
     map.cpp
     map_func.h
     map_type.h
     misc.cpp
     misc_cmd.cpp
     misc_gui.cpp
     mixer.cpp
     mixer.h
     music.cpp
     music_gui.cpp
     newgrf.cpp
     newgrf.h
     newgrf_airport.cpp
     newgrf_airport.h
     newgrf_airporttiles.cpp
     newgrf_airporttiles.h
     newgrf_animation_base.h
     newgrf_animation_type.h
     newgrf_callbacks.h
     newgrf_canal.cpp
     newgrf_canal.h
     newgrf_cargo.cpp
     newgrf_cargo.h
     newgrf_class.h
     newgrf_class_func.h
     newgrf_commons.cpp
     newgrf_commons.h
     newgrf_config.cpp
     newgrf_config.h
     newgrf_debug.h
     newgrf_debug_gui.cpp
     newgrf_engine.cpp
     newgrf_engine.h
     newgrf_generic.cpp
     newgrf_generic.h
     newgrf_gui.cpp
     newgrf_house.cpp
     newgrf_house.h
     newgrf_industries.cpp
     newgrf_industries.h
     newgrf_industrytiles.cpp
     newgrf_industrytiles.h
     newgrf_object.cpp
     newgrf_object.h
     newgrf_profiling.cpp
     newgrf_profiling.h
     newgrf_properties.h
     newgrf_railtype.cpp
     newgrf_railtype.h
     newgrf_roadtype.cpp
     newgrf_roadtype.h
     newgrf_sound.cpp
     newgrf_sound.h
     newgrf_spritegroup.cpp
     newgrf_spritegroup.h
     newgrf_station.cpp
     newgrf_station.h
     newgrf_storage.cpp
     newgrf_storage.h
     newgrf_text.cpp
     newgrf_text.h
     newgrf_town.cpp
     newgrf_town.h
     newgrf_townname.cpp
     newgrf_townname.h
     news_func.h
     news_gui.cpp
     news_gui.h
     news_type.h
     object.h
     object_base.h
     object_cmd.cpp
     object_gui.cpp
     object_map.h
     object_type.h
     openttd.cpp
     openttd.h
     order_backup.cpp
     order_backup.h
     order_base.h
     order_cmd.cpp
     order_func.h
     order_gui.cpp
     order_type.h
     osk_gui.cpp
     pbs.cpp
     pbs.h
     progress.cpp
     progress.h
     querystring_gui.h
     rail.cpp
     rail.h
     rail_cmd.cpp
     rail_gui.cpp
     rail_gui.h
     rail_map.h
     rail_type.h
     rev.h
     road.cpp
     road.h
     road_cmd.cpp
     road_cmd.h
     road_func.h
     road_gui.cpp
     road_gui.h
     road_internal.h
     road_map.cpp
     road_map.h
     road_type.h
     roadstop.cpp
     roadstop_base.h
     roadveh.h
     roadveh_cmd.cpp
     roadveh_gui.cpp
     safeguards.h
     screenshot_gui.cpp
     screenshot_gui.h
     screenshot.cpp
     screenshot.h
     settings.cpp
     settings_func.h
     settings_gui.cpp
     settings_gui.h
     settings_internal.h
     settings_type.h
     ship.h
     ship_cmd.cpp
     ship_gui.cpp
     signal.cpp
     signal_func.h
     signal_type.h
     signs.cpp
     signs_base.h
     signs_cmd.cpp
     signs_func.h
     signs_gui.cpp
     signs_type.h
     slope_func.h
     slope_type.h
     smallmap_gui.cpp
     smallmap_gui.h
     sortlist_type.h
     sound.cpp
     sound_func.h
     sound_type.h
     sprite.cpp
     sprite.h
     spritecache.cpp
     spritecache.h
     station.cpp
     station_base.h
     station_cmd.cpp
     station_func.h
     station_gui.cpp
     station_gui.h
     station_kdtree.h
     station_map.h
     station_type.h
     statusbar_gui.cpp
     statusbar_gui.h
     stdafx.h
     story.cpp
     story_base.h
     story_gui.cpp
     story_type.h
     strgen/strgen.h
     string.cpp
     string_base.h
     string_func.h
     string_type.h
     stringfilter.cpp
     stringfilter_type.h
     strings.cpp
     strings_func.h
     strings_type.h
     subsidy.cpp
     subsidy_base.h
     subsidy_func.h
     subsidy_gui.cpp
     subsidy_type.h
     tar_type.h
     terraform_cmd.cpp
     terraform_gui.cpp
     terraform_gui.h
     textbuf.cpp
     textbuf_gui.h
     textbuf_type.h
     texteff.cpp
     texteff.hpp
     textfile_gui.cpp
     textfile_gui.h
     textfile_type.h
     tgp.cpp
     tgp.h
     thread.h
     tile_cmd.h
     tile_map.cpp
     tile_map.h
     tile_type.h
     tilearea.cpp
     tilearea_type.h
     tilehighlight_func.h
     tilehighlight_type.h
     tilematrix_type.hpp
     timetable.h
     timetable_cmd.cpp
     timetable_gui.cpp
     toolbar_gui.cpp
     toolbar_gui.h
     town.h
     town_cmd.cpp
     town_gui.cpp
     town_kdtree.h
     town_map.h
     town_type.h
     townname.cpp
     townname_func.h
     townname_type.h
     track_func.h
     track_type.h
     train.h
     train_cmd.cpp
     train_gui.cpp
     transparency.h
     transparency_gui.cpp
     transparency_gui.h
     transport_type.h
     tree_cmd.cpp
     tree_gui.cpp
     tree_map.h
     tunnel_map.cpp
     tunnel_map.h
     tunnelbridge.h
     tunnelbridge_cmd.cpp
     tunnelbridge_map.h
     vehicle.cpp
     vehicle_base.h
     vehicle_cmd.cpp
     vehicle_func.h
     vehicle_gui.cpp
     vehicle_gui.h
     vehicle_gui_base.h
     vehicle_type.h
     vehiclelist.cpp
     vehiclelist.h
     viewport.cpp
     viewport_func.h
     viewport_gui.cpp
     viewport_kdtree.h
     viewport_sprite_sorter.h
     viewport_type.h
     void_cmd.cpp
     void_map.h
     water.h
     water_cmd.cpp
     water_map.h
     waypoint.cpp
     waypoint_base.h
     waypoint_cmd.cpp
     waypoint_func.h
     waypoint_gui.cpp
     widget.cpp
     widget_type.h
     window.cpp
     window_func.h
     window_gui.h
     window_type.h
     zoom_func.h
     zoom_type.h
+)

src/ai/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     ai.hpp
     ai_config.cpp
     ai_config.hpp
     ai_core.cpp
     ai_gui.cpp
     ai_gui.hpp
     ai_info.cpp
     ai_info.hpp
     ai_instance.cpp
     ai_instance.hpp
     ai_scanner.cpp
     ai_scanner.hpp
+)

src/blitter/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
 bpp_anim.cpp
 bpp_anim.hpp
 bpp_base.cpp
 bpp_base.hpp
 bpp_optimized.cpp
 bpp_optimized.hpp
 bpp_simple.cpp
 bpp_simple.hpp
 bpp_base.cpp
 bpp_base.hpp
 bpp_optimized.cpp
 bpp_optimized.hpp
 bpp_simple.cpp
 bpp_simple.hpp
     CONDITION NOT OPTION_DEDICATED
+)
 add_files(
 bpp_anim_sse2.cpp
 bpp_anim_sse2.hpp
 bpp_anim_sse4.cpp
 bpp_anim_sse4.hpp
 bpp_sse2.cpp
 bpp_sse2.hpp
 bpp_sse4.cpp
 bpp_sse4.hpp
 bpp_sse_func.hpp
 bpp_sse_type.h
 bpp_ssse3.cpp
 bpp_ssse3.hpp
     CONDITION NOT OPTION_DEDICATED AND SSE_FOUND
+)
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     set_compile_flags(
 bpp_anim_sse2.cpp
 bpp_sse2.cpp
         COMPILE_FLAGS -msse2)
     set_compile_flags(
 bpp_ssse3.cpp
         COMPILE_FLAGS -mssse3)
     set_compile_flags(
 bpp_anim_sse4.cpp
 bpp_sse4.cpp
         COMPILE_FLAGS -msse4.1)
 endif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
 add_files(
     base.hpp
     common.hpp
     factory.hpp
     null.cpp
     null.hpp
+)

src/core/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     alloc_func.cpp
     alloc_func.hpp
     alloc_type.hpp
     backup_type.hpp
     bitmath_func.cpp
     bitmath_func.hpp
     endian_func.hpp
     endian_type.hpp
     enum_type.hpp
     geometry_func.cpp
     geometry_func.hpp
     geometry_type.hpp
     kdtree.hpp
     math_func.cpp
     math_func.hpp
     mem_func.hpp
     multimap.hpp
     overflowsafe_type.hpp
     pool_func.cpp
     pool_func.hpp
     pool_type.hpp
     random_func.cpp
     random_func.hpp
     smallmap_type.hpp
     smallmatrix_type.hpp
     smallstack_type.hpp
     smallvec_type.hpp
     string_compare_type.hpp
+)

src/core/endian_type.hpp

➞

Show inline comments

@@ @@ -23,30 +23,8 @@ @@
 /** Big endian builds use this for TTD_ENDIAN. */
 #define TTD_BIG_ENDIAN 1
 /* Windows has always LITTLE_ENDIAN */
 #if defined(_WIN32) || defined(__OS2__) || defined(__HAIKU__)
 #	define TTD_ENDIAN TTD_LITTLE_ENDIAN
 #elif defined(OSX)
 #	include <sys/types.h>
 #	if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN
 #		define TTD_ENDIAN TTD_LITTLE_ENDIAN
 #	else
 #		define TTD_ENDIAN TTD_BIG_ENDIAN
 #	endif
 #elif defined(__OpenBSD__)
 #	include <endian.h>
 #	if BYTE_ORDER == LITTLE_ENDIAN
 #		define TTD_ENDIAN TTD_LITTLE_ENDIAN
 #	else
 #		define TTD_ENDIAN TTD_BIG_ENDIAN
 #	endif
 #elif !defined(TESTING)
 #	include <sys/param.h>
 #	if __BYTE_ORDER == __LITTLE_ENDIAN
 #		define TTD_ENDIAN TTD_LITTLE_ENDIAN
 #	else
 #		define TTD_ENDIAN TTD_BIG_ENDIAN
 #	endif
 #endif /* _WIN32 || __OS2__ */
 #if !defined(TTD_ENDIAN)
 #	error "TTD_ENDIAN is not defined; please set it to either TTD_LITTLE_ENDIAN or TTD_BIG_ENDIAN"
 #endif /* !TTD_ENDIAN */
 #endif /* ENDIAN_TYPE_HPP */

src/depend/depend.cpp

➞

Show inline comments

deleted file

src/game/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     game.hpp
     game_config.cpp
     game_config.hpp
     game_core.cpp
     game_info.cpp
     game_info.hpp
     game_instance.cpp
     game_instance.hpp
     game_scanner.cpp
     game_scanner.hpp
     game_text.cpp
     game_text.hpp
+)

src/lang/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 set(LANG_SOURCE_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/afrikaans.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/arabic_egypt.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/basque.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/belarusian.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/brazilian_portuguese.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/bulgarian.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/catalan.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/croatian.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/czech.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/danish.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/dutch.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/english.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/english_AU.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/english_US.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/esperanto.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/estonian.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/faroese.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/finnish.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/french.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/gaelic.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/galician.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/german.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/greek.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/hebrew.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/hungarian.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/icelandic.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/indonesian.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/irish.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/italian.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/japanese.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/korean.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/latin.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/latvian.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/lithuanian.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/luxembourgish.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/malay.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/norwegian_bokmal.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/norwegian_nynorsk.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/polish.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/portuguese.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/romanian.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/russian.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/serbian.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/simplified_chinese.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/slovak.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/slovenian.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/spanish.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/spanish_MX.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/swedish.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/tamil.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/thai.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/traditional_chinese.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/turkish.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/ukrainian.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/vietnamese.txt
         ${CMAKE_CURRENT_SOURCE_DIR}/welsh.txt
+)
 set(LANG_BINARY_DIR ${CMAKE_BINARY_DIR}/lang)
 # Walk over all the (finished) language files, and generate a command to compile them
 foreach(LANG_SOURCE_FILE IN LISTS LANG_SOURCE_FILES)
     get_filename_component(LANG_SOURCE_FILE_NAME_WE ${LANG_SOURCE_FILE} NAME_WE)
     set(LANG_BINARY_FILE ${LANG_BINARY_DIR}/${LANG_SOURCE_FILE_NAME_WE}.lng)
     add_custom_command(OUTPUT ${LANG_BINARY_FILE}
             COMMAND ${CMAKE_COMMAND} -E make_directory ${LANG_BINARY_DIR}
             COMMAND strgen
                     -s ${CMAKE_CURRENT_SOURCE_DIR}
                     -d ${LANG_BINARY_DIR}
                     ${LANG_SOURCE_FILE}
             DEPENDS strgen
             MAIN_DEPENDENCY ${LANG_SOURCE_FILE}
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
             COMMENT "Compiling language ${LANG_SOURCE_FILE_NAME_WE}"
+    )
     list(APPEND LANG_BINARY_FILES ${LANG_BINARY_FILE})
 endforeach(LANG_SOURCE_FILE)
 # Create a new target which compiles all language files
 add_custom_target(language_files
         DEPENDS
         ${LANG_BINARY_FILES}
+)
 set_target_properties(language_files
         PROPERTIES LANG_SOURCE_FILES "${LANG_SOURCE_FILES}"
+)
 set(GENERATED_BINARY_DIR ${CMAKE_BINARY_DIR}/generated)
 set(TABLE_BINARY_DIR ${GENERATED_BINARY_DIR}/table)
 # Generate a command and target to create the strings table
 add_custom_command_timestamp(OUTPUT ${TABLE_BINARY_DIR}/strings.h
         COMMAND ${CMAKE_COMMAND} -E make_directory ${TABLE_BINARY_DIR}
         COMMAND strgen
                 -s ${CMAKE_CURRENT_SOURCE_DIR}
                 -d ${TABLE_BINARY_DIR}
         DEPENDS strgen ${LANG_SOURCE_FILES}
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMENT "Generating table/strings.h"
+)
 add_custom_target_timestamp(table_strings
         DEPENDS
         ${TABLE_BINARY_DIR}/strings.h
+)
 add_library(languages
         INTERFACE
+)
 target_include_directories(languages
         INTERFACE
         ${GENERATED_BINARY_DIR}
+)
 add_dependencies(languages
         language_files
         table_strings
+)
 add_library(openttd::languages ALIAS languages)

src/linkgraph/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     demands.cpp
     demands.h
     flowmapper.cpp
     flowmapper.h
     init.h
     linkgraph.cpp
     linkgraph.h
     linkgraph_base.h
     linkgraph_gui.cpp
     linkgraph_gui.h
     linkgraph_type.h
     linkgraphjob.cpp
     linkgraphjob.h
     linkgraphjob_base.h
     linkgraphschedule.cpp
     linkgraphschedule.h
     mcf.cpp
     mcf.h
     refresh.cpp
     refresh.h
+)

src/misc/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     array.hpp
     binaryheap.hpp
     blob.hpp
     countedobj.cpp
     countedptr.hpp
     dbg_helpers.cpp
     dbg_helpers.h
     fixedsizearray.hpp
     getoptdata.cpp
     getoptdata.h
     hashtable.hpp
     str.hpp
+)

src/music/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 if (NOT OPTION_DEDICATED)
     add_files(
         allegro_m.cpp
         allegro_m.h
         CONDITION Allegro_FOUND
+    )
     add_files(
         fluidsynth.cpp
         fluidsynth.h
         CONDITION Fluidsynth_FOUND
+    )
     add_files(
         cocoa_m.cpp
         cocoa_m.h
         CONDITION APPLE
+    )
     add_files(
         dmusic.cpp
         dmusic.h
         win32_m.cpp
         win32_m.h
         CONDITION WIN32
+    )
     add_files(
         extmidi.cpp
         extmidi.h
         CONDITION UNIX
+    )
     add_files(
         bemidi.cpp
         bemidi.h
         CONDITION OPTION_HAIKU
+    )
     add_files(
         os2_m.cpp
         os2_m.h
         CONDITION OPTION_OS2
+    )
 endif (NOT OPTION_DEDICATED)
 add_files(
     midi.h
     midifile.cpp
     midifile.hpp
     music_driver.hpp
     null_m.cpp
     null_m.h
+)

src/network/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_subdirectory(core)
 add_files(
     network.cpp
     network.h
     network_admin.cpp
     network_admin.h
     network_base.h
     network_chat_gui.cpp
     network_client.cpp
     network_client.h
     network_command.cpp
     network_content.cpp
     network_content.h
     network_content_gui.cpp
     network_content_gui.h
     network_func.h
     network_gamelist.cpp
     network_gamelist.h
     network_gui.cpp
     network_gui.h
     network_internal.h
     network_server.cpp
     network_server.h
     network_type.h
     network_udp.cpp
     network_udp.h
+)

src/network/core/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     address.cpp
     address.h
     config.h
     core.cpp
     core.h
     game.h
     host.cpp
     host.h
     os_abstraction.h
     packet.cpp
     packet.h
     tcp.cpp
     tcp.h
     tcp_admin.cpp
     tcp_admin.h
     tcp_connect.cpp
     tcp_content.cpp
     tcp_content.h
     tcp_game.cpp
     tcp_game.h
     tcp_http.cpp
     tcp_http.h
     tcp_listen.h
     udp.cpp
     udp.h
+)

src/os/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_subdirectory(macosx)
 add_subdirectory(os2)
 add_subdirectory(unix)
 add_subdirectory(windows)

src/os/macosx/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     crashlog_osx.cpp
     macos.h
     macos.mm
     osx_stdafx.h
     splash.cpp
     splash.h
     string_osx.cpp
     string_osx.h
     CONDITION APPLE
+)

src/os/os2/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     os2.cpp
     CONDITION OPTION_OS2
+)

src/os/unix/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     crashlog_unix.cpp
     CONDITION UNIX AND NOT APPLE AND NOT OPTION_OS2
+)
 add_files(
     unix.cpp
     CONDITION UNIX AND NOT OPTION_OS2
+)

src/os/windows/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     crashlog_win.cpp
     string_uniscribe.cpp
     string_uniscribe.h
     win32.cpp
     win32.h
     CONDITION WIN32
+)

src/os/windows/ottdres.rc.in

➞

Show inline comments

@@ @@ -37,7 +37,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT @@
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-ICON    DISCARDABLE     "../../../media/openttd.ico"
+ICON    DISCARDABLE     "${CMAKE_SOURCE_DIR}/os/windows/openttd.ico"
 /////////////////////////////////////////////////////////////////////////////
 //
@@ @@ -77,8 +77,8 @@ END @@
 //
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 1,11,0,!!ISODATE!!
  PRODUCTVERSION 1,11,0,!!ISODATE!!
  FILEVERSION 1,11,0,${REV_ISODATE}
  PRODUCTVERSION 1,11,0,${REV_ISODATE}
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ @@ -96,14 +96,14 @@ BEGIN @@
             VALUE "Comments", "This program is licensed under the GNU General Public License version 2.\0"
             VALUE "CompanyName", "OpenTTD Development Team\0"
             VALUE "FileDescription", "OpenTTD\0"
-            VALUE "FileVersion", "!!VERSION!!\0"
+            VALUE "FileVersion", "${REV_VERSION}\0"
             VALUE "InternalName", "openttd\0"
-            VALUE "LegalCopyright", "Copyright \xA9 OpenTTD Developers 2002-!!YEAR!!. All Rights Reserved.\0"
+            VALUE "LegalCopyright", "Copyright \xA9 OpenTTD Developers 2002-${REV_YEAR}. All Rights Reserved.\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "openttd.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "OpenTTD\0"
-            VALUE "ProductVersion", "!!VERSION!!\0"
+            VALUE "ProductVersion", "${REV_VERSION}\0"
             VALUE "SpecialBuild", "-\0"
         END
     END
@@ @@ -116,7 +116,7 @@ END @@
 #endif    // !_MAC
 #ifdef __MINGW32__
-24 "..\\..\\..\\projects\\dpi_aware.manifest"
+24 "${CMAKE_SOURCE_DIR}/os/windows/openttd.manifest"
 #endif
 #endif    // Neutral (Default) resources

src/pathfinder/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_subdirectory(npf)
 add_subdirectory(yapf)
 add_files(
     follow_track.hpp
     pathfinder_func.h
     pathfinder_type.h
     pf_performance_timer.hpp
+)

src/pathfinder/npf/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     aystar.cpp
     aystar.h
     npf.cpp
     npf_func.h
     queue.cpp
     queue.h
+)

src/pathfinder/yapf/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     nodelist.hpp
     yapf.h
     yapf.hpp
     yapf_base.hpp
     yapf_cache.h
     yapf_common.hpp
     yapf_costbase.hpp
     yapf_costcache.hpp
     yapf_costrail.hpp
     yapf_destrail.hpp
     yapf_node.hpp
     yapf_node_rail.hpp
     yapf_node_road.hpp
     yapf_node_ship.hpp
     yapf_rail.cpp
     yapf_road.cpp
     yapf_ship.cpp
     yapf_type.hpp
+)

src/rev.cpp.in

➞

Show inline comments

@@ @@ -35,7 +35,7 @@ bool IsReleasedVersion() @@
+ *
  * <modified> shows a "M", if the binary is made from modified source code.
  */
-const char _openttd_revision[] = "!!VERSION!!";
+const char _openttd_revision[] = "${REV_VERSION}";
 /**
  * The text version of OpenTTD's build date.
@@ @@ -48,12 +48,12 @@ const char _openttd_build_date[] = __DAT @@
 /**
  * The git revision hash of this version.
  */
-const char _openttd_revision_hash[] = "!!GITHASH!!";
+const char _openttd_revision_hash[] = "${REV_HASH}";
 /**
  * The year of this version.
  */
-const char _openttd_revision_year[] = "!!YEAR!!";
+const char _openttd_revision_year[] = "${REV_YEAR}";
 /**
  * Let us know if current build was modified. This detection
@@ @@ -63,14 +63,14 @@ const char _openttd_revision_year[] = "! @@
  * (compiling from sources without any version control software)
  * and 2 is for modified revision.
  */
-const byte _openttd_revision_modified = !!MODIFIED!!;
+const byte _openttd_revision_modified = ${REV_MODIFIED};
 /**
  * Indicate whether this is a tagged version.
  * If this is non-0, then _openttd_revision is the name of the tag,
  * and the version is likely a beta, release candidate, or real release.
  */
-const byte _openttd_revision_tagged = !!ISTAG!!;
+const byte _openttd_revision_tagged = ${REV_ISTAG};
 /**
  * The NewGRF revision of OTTD:
@@ @@ -85,4 +85,4 @@ const byte _openttd_revision_tagged = !! @@
  * final release will always have a lower version number than the released
  * version, thus making comparisons on specific revisions easy.
  */
-const uint32 _openttd_newgrf_version = 1 << 28 | 11 << 24 | 0 << 20 | !!ISSTABLETAG!! << 19 | 28004;
+const uint32 _openttd_newgrf_version = 1 << 28 | 11 << 24 | 0 << 20 | ${REV_ISSTABLETAG} << 19 | 28004;

src/saveload/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     afterload.cpp
     ai_sl.cpp
     airport_sl.cpp
     animated_tile_sl.cpp
     autoreplace_sl.cpp
     cargomonitor_sl.cpp
     cargopacket_sl.cpp
     cheat_sl.cpp
     company_sl.cpp
     depot_sl.cpp
     economy_sl.cpp
     engine_sl.cpp
     game_sl.cpp
     gamelog_sl.cpp
     goal_sl.cpp
     group_sl.cpp
     industry_sl.cpp
     labelmaps_sl.cpp
     linkgraph_sl.cpp
     map_sl.cpp
     misc_sl.cpp
     newgrf_sl.cpp
     newgrf_sl.h
     object_sl.cpp
     oldloader.cpp
     oldloader.h
     oldloader_sl.cpp
     order_sl.cpp
     saveload.cpp
     saveload.h
     saveload_filter.h
     saveload_internal.h
     signs_sl.cpp
     station_sl.cpp
     storage_sl.cpp
     strings_sl.cpp
     story_sl.cpp
     subsidy_sl.cpp
     town_sl.cpp
     vehicle_sl.cpp
     waypoint_sl.cpp
+)

src/script/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_subdirectory(api)
 add_files(
     script_config.cpp
     script_config.hpp
     script_fatalerror.hpp
     script_info.cpp
     script_info.hpp
     script_info_dummy.cpp
     script_instance.cpp
     script_instance.hpp
     script_scanner.cpp
     script_scanner.hpp
     script_storage.hpp
     script_suspend.hpp
     squirrel.cpp
     squirrel.hpp
     squirrel_class.hpp
     squirrel_helper.hpp
     squirrel_helper_type.hpp
     squirrel_std.cpp
     squirrel_std.hpp
+)

src/script/api/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     ai_changelog.hpp
     game_changelog.hpp
     script_accounting.hpp
     script_admin.hpp
     script_airport.hpp
     script_base.hpp
     script_basestation.hpp
     script_bridge.hpp
     script_bridgelist.hpp
     script_cargo.hpp
     script_cargolist.hpp
     script_cargomonitor.hpp
     script_client.hpp
     script_clientlist.hpp
     script_company.hpp
     script_companymode.hpp
     script_controller.hpp
     script_date.hpp
     script_depotlist.hpp
     script_engine.hpp
     script_enginelist.hpp
     script_error.hpp
     script_event.hpp
     script_event_types.hpp
     script_execmode.hpp
     script_game.hpp
     script_gamesettings.hpp
     script_goal.hpp
     script_group.hpp
     script_grouplist.hpp
     script_industry.hpp
     script_industrylist.hpp
     script_industrytype.hpp
     script_industrytypelist.hpp
     script_info_docs.hpp
     script_infrastructure.hpp
     script_list.hpp
     script_log.hpp
     script_map.hpp
     script_marine.hpp
     script_news.hpp
     script_object.hpp
     script_order.hpp
     script_priorityqueue.hpp
     script_rail.hpp
     script_railtypelist.hpp
     script_road.hpp
     script_roadtypelist.hpp
     script_sign.hpp
     script_signlist.hpp
     script_station.hpp
     script_stationlist.hpp
     script_story_page.hpp
     script_storypagelist.hpp
     script_storypageelementlist.hpp
     script_subsidy.hpp
     script_subsidylist.hpp
     script_testmode.hpp
     script_text.hpp
     script_tile.hpp
     script_tilelist.hpp
     script_town.hpp
     script_townlist.hpp
     script_tunnel.hpp
     script_types.hpp
     script_vehicle.hpp
     script_vehiclelist.hpp
     script_viewport.hpp
     script_waypoint.hpp
     script_waypointlist.hpp
     script_window.hpp
     script_accounting.cpp
     script_admin.cpp
     script_airport.cpp
     script_base.cpp
     script_basestation.cpp
     script_bridge.cpp
     script_bridgelist.cpp
     script_cargo.cpp
     script_cargolist.cpp
     script_cargomonitor.cpp
     script_client.cpp
     script_clientlist.cpp
     script_company.cpp
     script_companymode.cpp
     script_controller.cpp
     script_date.cpp
     script_depotlist.cpp
     script_engine.cpp
     script_enginelist.cpp
     script_error.cpp
     script_event.cpp
     script_event_types.cpp
     script_execmode.cpp
     script_game.cpp
     script_gamesettings.cpp
     script_goal.cpp
     script_group.cpp
     script_grouplist.cpp
     script_industry.cpp
     script_industrylist.cpp
     script_industrytype.cpp
     script_industrytypelist.cpp
     script_infrastructure.cpp
     script_list.cpp
     script_log.cpp
     script_map.cpp
     script_marine.cpp
     script_news.cpp
     script_object.cpp
     script_order.cpp
     script_priorityqueue.cpp
     script_rail.cpp
     script_railtypelist.cpp
     script_road.cpp
     script_roadtypelist.cpp
     script_sign.cpp
     script_signlist.cpp
     script_station.cpp
     script_stationlist.cpp
     script_story_page.cpp
     script_storypagelist.cpp
     script_storypageelementlist.cpp
     script_subsidy.cpp
     script_subsidylist.cpp
     script_testmode.cpp
     script_text.cpp
     script_tile.cpp
     script_tilelist.cpp
     script_town.cpp
     script_townlist.cpp
     script_tunnel.cpp
     script_vehicle.cpp
     script_vehiclelist.cpp
     script_viewport.cpp
     script_waypoint.cpp
     script_waypointlist.cpp
     script_window.cpp
+)

src/settingsgen/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 cmake_minimum_required(VERSION 3.5)
 project(settingsgen)
 set(sourcefiles
         settingsgen.cpp
         ../core/alloc_func.cpp
         ../misc/getoptdata.cpp
         ../ini_load.cpp
         ../string.cpp
+)
 add_definitions(-DSETTINGSGEN)
 add_executable(settingsgen ${sourcefiles})

src/sound/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 if (NOT OPTION_DEDICATED)
     add_files(
         allegro_s.cpp
         allegro_s.h
         CONDITION Allegro_FOUND
+    )
     add_files(
         sdl_s.cpp
         sdl_s.h
         CONDITION SDL_FOUND
+    )
     add_files(
         cocoa_s.cpp
         cocoa_s.h
         CONDITION APPLE
+    )
     add_files(
         win32_s.cpp
         win32_s.h
         CONDITION WIN32
+    )
     add_files(
         xaudio2_s.cpp
         xaudio2_s.h
         CONDITION WIN32 AND XAUDIO2_FOUND
+    )
 endif (NOT OPTION_DEDICATED)
 add_files(
     sound_driver.hpp
     null_s.cpp
     null_s.h
+)

src/spriteloader/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     grf.cpp
     grf.hpp
     spriteloader.hpp
+)

src/stdafx.h

➞

Show inline comments

@@ @@ -424,17 +424,14 @@ void NORETURN CDECL usererror(const char @@
 void NORETURN CDECL error(const char *str, ...) WARN_FORMAT(1, 2);
 #define NOT_REACHED() error("NOT_REACHED triggered at line %i of %s", __LINE__, __FILE__)
 /* For non-debug builds with assertions enabled use the special assertion handler:
  * - For MSVC: NDEBUG is set for all release builds and WITH_ASSERT overrides the disabling of asserts.
  * - For non MSVC: NDEBUG is set when assertions are disables, _DEBUG is set for non-release builds.
  */
 #if (defined(_MSC_VER) && defined(NDEBUG) && defined(WITH_ASSERT)) || (!defined(_MSC_VER) && !defined(NDEBUG) && !defined(_DEBUG))
 /* For non-debug builds with assertions enabled use the special assertion handler. */
 #if defined(NDEBUG) && defined(WITH_ASSERT)
 	#undef assert
 	#define assert(expression) if (!(expression)) error("Assertion failed at line %i of %s: %s", __LINE__, __FILE__, #expression);
 #endif
 /* Asserts are enabled if NDEBUG isn't defined, or if we are using MSVC and WITH_ASSERT is defined. */
 #if !defined(NDEBUG) || (defined(_MSC_VER) && defined(WITH_ASSERT))
 /* Asserts are enabled if NDEBUG isn't defined or WITH_ASSERT is defined. */
 #if !defined(NDEBUG) || defined(WITH_ASSERT)
 	#define OTTD_ASSERT
 #endif

src/strgen/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 cmake_minimum_required(VERSION 3.5)
 project(strgen)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake")
 set(sourcefiles
         strgen.cpp
         strgen_base.cpp
         ../core/alloc_func.cpp
         ../misc/getoptdata.cpp
         ../string.cpp
+)
 add_definitions(-DSTRGEN)
 add_executable(strgen ${sourcefiles})
 include(Endian)
 add_endian_definition()
 # Source Files
 add_files(strgen_base.cpp)
 # Header Files
 add_files(strgen.h)

src/table/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 set(GENERATED_BINARY_DIR ${CMAKE_BINARY_DIR}/generated)
 set(TABLE_BINARY_DIR ${GENERATED_BINARY_DIR}/table)
 set(TABLE_INI_SOURCE_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/company_settings.ini
         ${CMAKE_CURRENT_SOURCE_DIR}/currency_settings.ini
         ${CMAKE_CURRENT_SOURCE_DIR}/gameopt_settings.ini
         ${CMAKE_CURRENT_SOURCE_DIR}/misc_settings.ini
         ${CMAKE_CURRENT_SOURCE_DIR}/settings.ini
         ${CMAKE_CURRENT_SOURCE_DIR}/win32_settings.ini
         ${CMAKE_CURRENT_SOURCE_DIR}/window_settings.ini
+)
 # Generate a command and target to create the settings table
 add_custom_command_timestamp(OUTPUT ${TABLE_BINARY_DIR}/settings.h
         COMMAND ${CMAKE_COMMAND} -E make_directory ${TABLE_BINARY_DIR}
         COMMAND settingsgen
                 -o ${TABLE_BINARY_DIR}/settings.h
                 -b ${CMAKE_SOURCE_DIR}/src/table/settings.h.preamble
                 -a ${CMAKE_SOURCE_DIR}/src/table/settings.h.postamble
                 ${TABLE_INI_SOURCE_FILES}
         DEPENDS settingsgen ${TABLE_INI_SOURCE_FILES}
                 ${CMAKE_SOURCE_DIR}/src/table/settings.h.preamble
                 ${CMAKE_SOURCE_DIR}/src/table/settings.h.postamble
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMENT "Generating table/settings.h"
+)
 add_custom_target_timestamp(table_settings
         DEPENDS
         ${TABLE_BINARY_DIR}/settings.h
+)
 add_library(settings
         INTERFACE
+)
 target_include_directories(settings
         INTERFACE
         ${GENERATED_BINARY_DIR}
+)
 add_dependencies(settings
         table_settings
+)
 add_library(openttd::settings ALIAS settings)
 add_files(
     airport_defaults.h
     airport_movement.h
     airporttile_ids.h
     airporttiles.h
     animcursors.h
     autorail.h
     bridge_land.h
     build_industry.h
     cargo_const.h
     clear_land.h
     control_codes.h
     elrail_data.h
     engines.h
     genland.h
     heightmap_colours.h
     industry_land.h
     landscape_sprite.h
     newgrf_debug_data.h
     object_land.h
     palette_convert.h
     palettes.h
     pricebase.h
     railtypes.h
     road_land.h
     roadtypes.h
     roadveh_movement.h
     sprites.h
     station_land.h
     strgen_tables.h
     string_colours.h
     town_land.h
     townname.h
     track_land.h
     train_cmd.h
     tree_land.h
     unicode.h
     water_land.h
+)

src/video/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_subdirectory(cocoa)
 if (NOT OPTION_DEDICATED)
     add_files(
         allegro_v.cpp
         allegro_v.h
         CONDITION Allegro_FOUND
+    )
     add_files(
         sdl_v.cpp
         sdl_v.h
         CONDITION SDL_FOUND
+    )
     add_files(
         sdl2_v.cpp
         sdl2_v.h
         CONDITION SDL2_FOUND
+    )
     add_files(
         win32_v.cpp
         win32_v.h
         CONDITION WIN32
+    )
 endif (NOT OPTION_DEDICATED)
 add_files(
     dedicated_v.cpp
     dedicated_v.h
     null_v.cpp
     null_v.h
     video_driver.hpp
+)

src/video/cocoa/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     cocoa_keys.h
     cocoa_v.h
     cocoa_v.mm
     event.mm
     wnd_quartz.mm
     CONDITION APPLE
+)

src/widgets/CMakeLists.txt

➞

Show inline comments

@@ new file 100644 @@
 add_files(
     ai_widget.h
     airport_widget.h
     autoreplace_widget.h
     bootstrap_widget.h
     bridge_widget.h
     build_vehicle_widget.h
     cheat_widget.h
     company_widget.h
     console_widget.h
     date_widget.h
     depot_widget.h
     dock_widget.h
     dropdown.cpp
     dropdown_func.h
     dropdown_type.h
     dropdown_widget.h
     engine_widget.h
     error_widget.h
     fios_widget.h
     framerate_widget.h
     genworld_widget.h
     goal_widget.h
     graph_widget.h
     group_widget.h
     highscore_widget.h
     industry_widget.h
     intro_widget.h
     link_graph_legend_widget.h
     main_widget.h
     misc_widget.h
     music_widget.h
     network_chat_widget.h
     network_content_widget.h
     network_widget.h
     newgrf_debug_widget.h
     newgrf_widget.h
     news_widget.h
     object_widget.h
     order_widget.h
     osk_widget.h
     rail_widget.h
     road_widget.h
     screenshot_widget.h
     settings_widget.h
     sign_widget.h
     smallmap_widget.h
     station_widget.h
     statusbar_widget.h
     story_widget.h
     subsidy_widget.h
     terraform_widget.h
     timetable_widget.h
     toolbar_widget.h
     town_widget.h
     transparency_widget.h
     tree_widget.h
     vehicle_widget.h
     viewport_widget.h
     waypoint_widget.h
+)

0 comments (0 inline, 0 general)