From e58046c9477d52470ebb50e2dbd1ccc1af9dae25 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sat, 29 May 2021 10:58:07 +0200 Subject: [PATCH] Codechange: move all settings.ini files to table/settings --- src/table/CMakeLists.txt | 48 +------------------ src/table/settings/CMakeLists.txt | 47 ++++++++++++++++++ src/table/{ => settings}/company_settings.ini | 0 .../{ => settings}/currency_settings.ini | 0 src/table/{ => settings}/gameopt_settings.ini | 0 src/table/{ => settings}/misc_settings.ini | 0 src/table/{ => settings}/settings.ini | 0 src/table/{ => settings}/win32_settings.ini | 0 src/table/{ => settings}/window_settings.ini | 0 9 files changed, 48 insertions(+), 47 deletions(-) create mode 100644 src/table/settings/CMakeLists.txt rename src/table/{ => settings}/company_settings.ini (100%) rename src/table/{ => settings}/currency_settings.ini (100%) rename src/table/{ => settings}/gameopt_settings.ini (100%) rename src/table/{ => settings}/misc_settings.ini (100%) rename src/table/{ => settings}/settings.ini (100%) rename src/table/{ => settings}/win32_settings.ini (100%) rename src/table/{ => settings}/window_settings.ini (100%) diff --git a/src/table/CMakeLists.txt b/src/table/CMakeLists.txt index bb2311cf1e..c4043681b7 100644 --- a/src/table/CMakeLists.txt +++ b/src/table/CMakeLists.txt @@ -1,50 +1,4 @@ -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 -) - -if (HOST_BINARY_DIR) - include(${HOST_BINARY_DIR}/settingsgen.cmake) -endif() - -# 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_subdirectory(settings) add_files( airport_defaults.h diff --git a/src/table/settings/CMakeLists.txt b/src/table/settings/CMakeLists.txt new file mode 100644 index 0000000000..b1503145fd --- /dev/null +++ b/src/table/settings/CMakeLists.txt @@ -0,0 +1,47 @@ +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 +) + +if (HOST_BINARY_DIR) + include(${HOST_BINARY_DIR}/settingsgen.cmake) +endif() + +# 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) diff --git a/src/table/company_settings.ini b/src/table/settings/company_settings.ini similarity index 100% rename from src/table/company_settings.ini rename to src/table/settings/company_settings.ini diff --git a/src/table/currency_settings.ini b/src/table/settings/currency_settings.ini similarity index 100% rename from src/table/currency_settings.ini rename to src/table/settings/currency_settings.ini diff --git a/src/table/gameopt_settings.ini b/src/table/settings/gameopt_settings.ini similarity index 100% rename from src/table/gameopt_settings.ini rename to src/table/settings/gameopt_settings.ini diff --git a/src/table/misc_settings.ini b/src/table/settings/misc_settings.ini similarity index 100% rename from src/table/misc_settings.ini rename to src/table/settings/misc_settings.ini diff --git a/src/table/settings.ini b/src/table/settings/settings.ini similarity index 100% rename from src/table/settings.ini rename to src/table/settings/settings.ini diff --git a/src/table/win32_settings.ini b/src/table/settings/win32_settings.ini similarity index 100% rename from src/table/win32_settings.ini rename to src/table/settings/win32_settings.ini diff --git a/src/table/window_settings.ini b/src/table/settings/window_settings.ini similarity index 100% rename from src/table/window_settings.ini rename to src/table/settings/window_settings.ini