flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #2424 from cuberite/CompileMSVC2015

Browse Source 
Compile MSVC2015
This commit is contained in:
worktycho 2015-08-10 20:12:06 +01:00
commit 63b65c19ef
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/SQLiteCpp

@ -1 +1 @@
Subproject commit 49679e7b54726e2d94d3aad76a65aeb9c1088afd Subproject commit af78d59349fd013341746b345961e3f19ecae60d

6
src/LeakFinder.cpp
View File

@ -103,9 +103,9 @@
#include "LeakFinder.h" #include "LeakFinder.h"
// Currently only tested with MS VC++ 5 to 10 // Currently only tested with MS VC++ 5 to 2015
#if (_MSC_VER < 1100) || (_MSC_VER > 1800) #if (_MSC_VER < 1100) || (_MSC_VER > 1900)
#error Only MS VC++ 5/6/7/7.1/8/9/10/11/12 supported. Check if the '_CrtMemBlockHeader' has not changed with this compiler! #error Only MS VC++ 5/6/7/7.1/8/9/10/11/12 supported. Check if the '_CrtMemBlockHeader' has not changed with this compiler!
#endif #endif

7
src/main.cpp
View File

@ -48,9 +48,10 @@ bool cRoot::m_RunAsService = false;
/** If defined, a thorough leak finder will be used (debug MSVC only); leaks will be output to the Output window */ /** If defined, a thorough leak finder will be used (debug MSVC only); leaks will be output to the Output window
// _X 2014_02_20: Disabled for canon repo, it makes the debug version too slow in MSVC2013 _X 2014_02_20: Disabled for canon repo, it makes the debug version too slow in MSVC2013
// and we haven't had a memory leak for over a year anyway. and we haven't had a memory leak for over a year anyway.
Synchronize this with Server.cpp to enable the "dumpmem" console command. */
// #define ENABLE_LEAK_FINDER // #define ENABLE_LEAK_FINDER