Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core: Fix build for msvc14

Browse Source
This commit is contained in:
Vincent-Michael
2014-09-20 05:39:26 +02:00
parent 4e951f9d9b
commit bd522a3853
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/macros/FindBoost.cmake
View File

@@ -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)

5
src/server/shared/Packets/ByteBuffer.h
View File

@@ -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(&lt) + _timezone);
#else
return uint32(mktime(&lt) + timezone);
#endif
}
ByteBuffer& ReadPackedTime(uint32& time)