From bd522a3853951cf8ea4b0b9e2f225a8bdc38da04 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sat, 20 Sep 2014 05:39:26 +0200 Subject: Core: Fix build for msvc14 --- cmake/macros/FindBoost.cmake | 2 ++ src/server/shared/Packets/ByteBuffer.h | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/cmake/macros/FindBoost.cmake b/cmake/macros/FindBoost.cmake index 90bba26db70..ebd1c29598a 100644 --- a/cmake/macros/FindBoost.cmake +++ b/cmake/macros/FindBoost.cmake @@ -349,6 +349,8 @@ function(_Boost_GUESS_COMPILER_PREFIX _ret) else() set (_boost_COMPILER "-il") endif() + elseif (MSVC14) + set(_boost_COMPILER "-vc140") elseif (MSVC12) set(_boost_COMPILER "-vc120") elseif (MSVC11) diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index 3d44c975c96..b0ad2408710 100644 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -393,7 +393,12 @@ class ByteBuffer lt.tm_mon = (packedDate >> 20) & 0xF; lt.tm_year = ((packedDate >> 24) & 0x1F) + 100; +// To-Do: find a better way here +#if !defined(timezone) + return uint32(mktime(<) + _timezone); +#else return uint32(mktime(<) + timezone); +#endif } ByteBuffer& ReadPackedTime(uint32& time) -- cgit v1.2.3