From 00530d80a7e5d1ac17e5cdbab9f2a6d1b4ac5f0d Mon Sep 17 00:00:00 2001 From: Ricardo Date: Thu, 8 Dec 2016 16:37:39 +0100 Subject: [PATCH 1/2] Update CCRakNetSlidingWindow.cpp ambiguation with abs function --- Source/CCRakNetSlidingWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/CCRakNetSlidingWindow.cpp b/Source/CCRakNetSlidingWindow.cpp index 611c3c02e..fa6f67c02 100644 --- a/Source/CCRakNetSlidingWindow.cpp +++ b/Source/CCRakNetSlidingWindow.cpp @@ -22,7 +22,7 @@ static const CCTimeType SYN=10000; #include "MTUSize.h" #include -#include +#include #include #include "RakAssert.h" #include "RakAlloca.h" From da83aedf1e89e84aa2b3702b16ce02204a254b9e Mon Sep 17 00:00:00 2001 From: Ricardo Date: Thu, 8 Dec 2016 16:38:07 +0100 Subject: [PATCH 2/2] Update CMakeLists.txt compatibility with Visual Studio 2015 --- Lib/LibStatic/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/LibStatic/CMakeLists.txt b/Lib/LibStatic/CMakeLists.txt index c116ee5f0..67e98587e 100644 --- a/Lib/LibStatic/CMakeLists.txt +++ b/Lib/LibStatic/CMakeLists.txt @@ -17,7 +17,7 @@ IF(WIN32 AND NOT UNIX) IF(NOT ${CMAKE_GENERATOR} STREQUAL "MSYS Makefiles") - IF( MSVC10 OR MSVC11 OR MSVC12 ) + IF( MSVC10 OR MSVC11 OR MSVC12 OR MSVC14 ) set_target_properties(RakNetLibStatic PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB:\"LIBCD.lib LIBCMTD.lib MSVCRT.lib\"" ) ELSE() set_target_properties(RakNetLibStatic PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB:"LIBCD.lib LIBCMTD.lib MSVCRT.lib"" )