Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

hotfix: restored missing NOISE_IN_SUBDIR #include-conditional code #1063

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

hotfix: restored missing NOISE_IN_SUBDIR #include-conditional code #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84e439d
hotfix: missing NOISE_IN_SUBDIR conditional define
tcoyvwac Jul 10, 2023
5403233
hotfix: missing NOISE_IN_SUBDIR cmake-define in conan builds
tcoyvwac Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmake/DependenciesConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

include(FixSDLTargets)
include(FixLibNoise)
6 changes: 4 additions & 2 deletions src/engine/map/TerrainGenerator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@
#include <PointFunctions.hxx>

#include "json.hxx"

#ifdef NOISE_IN_SUBDIR
#include <noise/noise.h>

#else
#include <noise.h>
#endif
#include <random>

using json = nlohmann::json;
Expand Down