Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 01:53:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove mathconstants.h and use the correct way to get M_PI in MSVC. (#5072)

Browse Source
This commit is contained in:
red-001 2017-01-20 22:19:41 +00:00 committed by Loïc Blot
parent efa54f9c46
commit 0dada51a55
12 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -284,6 +284,8 @@ if(WIN32)
set(PLATFORM_LIBS dbghelp.lib ${PLATFORM_LIBS})
# Surpress some useless warnings
add_definitions ( /D "_CRT_SECURE_NO_DEPRECATE" /W1 )
# Get M_PI to work
add_definitions(/D "_USE_MATH_DEFINES")
else() # Probably MinGW = GCC
set(PLATFORM_LIBS "")
endif()

1
src/camera.cpp
View File

@ -31,7 +31,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "event.h"
#include "profiler.h"
#include "util/numeric.h"
#include "util/mathconstants.h"
#include "constants.h"
#include "fontengine.h"

1
src/clientiface.cpp
View File

@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "clientiface.h"
#include "util/numeric.h"
#include "util/mathconstants.h"
#include "remoteplayer.h"
#include "settings.h"
#include "mapblock.h"

1
src/clientmap.cpp
View File

@ -29,7 +29,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "profiler.h"
#include "settings.h"
#include "camera.h" // CameraModes
#include "util/mathconstants.h"
#include "util/basic_macros.h"
#include <algorithm>

1
src/content_cao.cpp
View File

@ -26,7 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "content_cao.h"
#include "util/numeric.h" // For IntervalLimiter
#include "util/serialize.h"
#include "util/mathconstants.h"
#include "util/basic_macros.h"
#include "client/tile.h"
#include "environment.h"

1
src/content_sao.cpp
View File

@ -18,7 +18,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/
#include "content_sao.h"
#include "util/mathconstants.h"
#include "util/serialize.h"
#include "collision.h"
#include "environment.h"

1
src/map.cpp
View File

@ -32,7 +32,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "nodedef.h"
#include "gamedef.h"
#include "util/directiontables.h"
#include "util/mathconstants.h"
#include "util/basic_macros.h"
#include "rollback_interface.h"
#include "environment.h"

1
src/mg_biome.cpp
View File

@ -24,7 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "nodedef.h"
#include "map.h" //for MMVManip
#include "util/numeric.h"
#include "util/mathconstants.h"
#include "porting.h"
#include "settings.h"

1
src/server.cpp
View File

@ -53,7 +53,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "event_manager.h"
#include "serverlist.h"
#include "util/string.h"
#include "util/mathconstants.h"
#include "rollback.h"
#include "util/serialize.h"
#include "util/thread.h"

1
src/treegen.cpp
View File

@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <stack>
#include "util/pointer.h"
#include "util/numeric.h"
#include "util/mathconstants.h"
#include "map.h"
#include "serverenvironment.h"
#include "nodedef.h"

7
src/util/mathconstants.h
View File

@ -1,7 +0,0 @@
#include <math.h>
// MSVC doesn't seem to define this
#ifndef M_PI
#define M_PI 3.1415926535
#endif

1
src/util/numeric.cpp
View File

@ -18,7 +18,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/
#include "numeric.h"
#include "mathconstants.h"
#include "log.h"
#include "../constants.h" // BS, MAP_BLOCKSIZE