From 84e439d51f732a75c8a629194c0f3a6460e4c853 Mon Sep 17 00:00:00 2001 From: tcoyvwac <53616399+tcoyvwac@users.noreply.github.com> Date: Mon, 10 Jul 2023 16:45:04 +0200 Subject: [PATCH 1/2] hotfix: missing NOISE_IN_SUBDIR conditional define Compiling fails if NOISE_IN_SUBDIR include-route is not defined. Restored conditional-include-code and fixed regression detected onwards from commit: d1e96913. --- src/engine/map/TerrainGenerator.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/engine/map/TerrainGenerator.cxx b/src/engine/map/TerrainGenerator.cxx index dc93950c55..14e3d3d519 100644 --- a/src/engine/map/TerrainGenerator.cxx +++ b/src/engine/map/TerrainGenerator.cxx @@ -8,9 +8,11 @@ #include #include "json.hxx" - +#ifdef NOISE_IN_SUBDIR #include - +#else +#include +#endif #include using json = nlohmann::json; From 540323318b5db168291cdea8caaad06fc0aedbdf Mon Sep 17 00:00:00 2001 From: tcoyvwac <53616399+tcoyvwac@users.noreply.github.com> Date: Thu, 13 Jul 2023 00:15:38 +0200 Subject: [PATCH 2/2] hotfix: missing NOISE_IN_SUBDIR cmake-define in conan builds --- cmake/DependenciesConfig.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/DependenciesConfig.cmake b/cmake/DependenciesConfig.cmake index a6e2cb59db..f4e9207847 100644 --- a/cmake/DependenciesConfig.cmake +++ b/cmake/DependenciesConfig.cmake @@ -19,5 +19,6 @@ cmake_dependent_option(USE_ANGELSCRIPT "use Angelscript" ON "TARGET Angelscript: find_package(microprofile CONFIG) option(USE_MICROPROFILE "use Microprofile" OFF) - -include(FixSDLTargets) \ No newline at end of file + +include(FixSDLTargets) +include(FixLibNoise)