summaryrefslogtreecommitdiff
path: root/src/noise.cpp
diff options
context:
space:
mode:
authoradrido <robots_only_adrido@gmx.com>2017-06-27 11:54:40 +0200
committerLoïc Blot <nerzhul@users.noreply.github.com>2017-06-27 11:54:40 +0200
commitd7343b6c930d22857f858929ea684acbbeefe482 (patch)
treea4611d3bc6546af879e8cf433cf49ce8df41ab55 /src/noise.cpp
parent48cd217e3b6f53af32802c1897ddd1914d215078 (diff)
downloadminetest-d7343b6c930d22857f858929ea684acbbeefe482.tar.gz
minetest-d7343b6c930d22857f858929ea684acbbeefe482.tar.bz2
minetest-d7343b6c930d22857f858929ea684acbbeefe482.zip
Fix msvc annoyances (#5963)
* MSVC: Fix '/std:c++11' is not a valid compiler option * MSVC/MINGW: Define 'WIN32_LEAN_AND_MEAN' for the whole project In some obscure cases 'Windows.h" got includet before that definition, which leaded to compilation warnings+errors * MSVC: '/arch:SSE' is only available for x86 * MSVC: Fix float conversation * MSVC/MINGW: use winthreads on Windows * MSVC: 'USE_CMAKE_CONFIG' might be already definied by CMake build system * MSVC: Use all available cpu cores for compiling * Add missing include ctime and use std::time_t
Diffstat (limited to 'src/noise.cpp')
-rw-r--r--src/noise.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/noise.cpp b/src/noise.cpp
index e75fb8278..f67771b88 100644
--- a/src/noise.cpp
+++ b/src/noise.cpp
@@ -47,8 +47,8 @@ typedef float (*Interp3dFxn)(
float x, float y, float z);
float cos_lookup[16] = {
- 1.0, 0.9238, 0.7071, 0.3826, 0, -0.3826, -0.7071, -0.9238,
- 1.0, -0.9238, -0.7071, -0.3826, 0, 0.3826, 0.7071, 0.9238
+ 1.0f, 0.9238f, 0.7071f, 0.3826f, .0f, -0.3826f, -0.7071f, -0.9238f,
+ 1.0f, -0.9238f, -0.7071f, -0.3826f, .0f, 0.3826f, 0.7071f, 0.9238f
};
FlagDesc flagdesc_noiseparams[] = {