diff options
| author | Patric Stout <truebrain@openttd.org> | 2019-04-07 11:57:55 +0200 |
|---|---|---|
| committer | glx22 <glx22@users.noreply.github.com> | 2020-06-05 19:36:05 +0200 |
| commit | 56d54cf60eb5814f77dfcce91cf12879f01e1d1b (patch) | |
| tree | e35fc5b7becc8f993d8c44179bc16e2586c3c64d /media | |
| parent | 85315e2e3132dd7aff9ee96c1ba8d282350d9d5e (diff) | |
| download | openttd-56d54cf60eb5814f77dfcce91cf12879f01e1d1b.tar.xz | |
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.
Diffstat (limited to 'media')
| -rw-r--r-- | media/baseset/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | media/baseset/openttd/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | media/baseset/orig_extra/CMakeLists.txt | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/media/baseset/CMakeLists.txt b/media/baseset/CMakeLists.txt index 309ac7a49..c3fe34ce4 100644 --- a/media/baseset/CMakeLists.txt +++ b/media/baseset/CMakeLists.txt @@ -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) diff --git a/media/baseset/openttd/CMakeLists.txt b/media/baseset/openttd/CMakeLists.txt index 42d62dd7c..c4f8d61ad 100644 --- a/media/baseset/openttd/CMakeLists.txt +++ b/media/baseset/openttd/CMakeLists.txt @@ -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) diff --git a/media/baseset/orig_extra/CMakeLists.txt b/media/baseset/orig_extra/CMakeLists.txt index f865a8dd0..36a25329f 100644 --- a/media/baseset/orig_extra/CMakeLists.txt +++ b/media/baseset/orig_extra/CMakeLists.txt @@ -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) |