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

Fix several MSVC issues numeric.h

Browse Source 
-> Round negative numbers correctly CMakeLists.txt
-> Link Json with the static run-time library
This commit is contained in:
SmallJoker 2015-04-29 19:28:25 +02:00 committed by est31
parent 37ca3212ee
commit 6626a3f72f
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/json/CMakeLists.txt
View File

@ -1,4 +1,7 @@
add_library(jsoncpp jsoncpp.cpp) if(MSVC)
set(CMAKE_CXX_FLAGS_RELEASE "/MT")
endif()
add_library(jsoncpp jsoncpp.cpp)
target_link_libraries(jsoncpp) target_link_libraries(jsoncpp)

11
src/unittest/test_utilities.cpp
View File

@ -45,6 +45,7 @@ public:
void testWrapRows(); void testWrapRows();
void testIsNumber(); void testIsNumber();
void testIsPowerOfTwo(); void testIsPowerOfTwo();
void testMyround();
}; };
static TestUtilities g_test_instance; static TestUtilities g_test_instance;
@ -67,6 +68,7 @@ void TestUtilities::runTests(IGameDef *gamedef)
TEST(testWrapRows); TEST(testWrapRows);
TEST(testIsNumber); TEST(testIsNumber);
TEST(testIsPowerOfTwo); TEST(testIsPowerOfTwo);
TEST(testMyround);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -239,3 +241,12 @@ void TestUtilities::testIsPowerOfTwo()
} }
UASSERT(is_power_of_two((u32)-1) == false); UASSERT(is_power_of_two((u32)-1) == false);
} }
void TestUtilities::testMyround()
{
UASSERT(myround(4.6f) == 5);
UASSERT(myround(1.2f) == 1);
UASSERT(myround(-3.1f) == -3);
UASSERT(myround(-6.5f) == -7);
}

2
src/util/numeric.h
View File

@ -288,7 +288,7 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
*/ */
inline s32 myround(f32 f) inline s32 myround(f32 f)
{ {
return floor(f + 0.5); return (s32)(f < 0.f ? (f - 0.5f) : (f + 0.5f));
} }
/* /*