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

Windows: Fixed builds with LeakFinder enabled.

Browse Source
This commit is contained in:
Mattes D 2014-11-26 11:00:21 +01:00
parent 0ca891da6d
commit 413e5c20fe
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -39,6 +39,7 @@ SET (SRCS
Inventory.cpp Inventory.cpp
Item.cpp Item.cpp
ItemGrid.cpp ItemGrid.cpp
LeakFinder.cpp
LightingThread.cpp LightingThread.cpp
LineBlockTracer.cpp LineBlockTracer.cpp
LinearInterpolation.cpp LinearInterpolation.cpp
@ -58,6 +59,7 @@ SET (SRCS
Scoreboard.cpp Scoreboard.cpp
Server.cpp Server.cpp
SetChunkData.cpp SetChunkData.cpp
StackWalker.cpp
Statistics.cpp Statistics.cpp
StringCompression.cpp StringCompression.cpp
StringUtils.cpp StringUtils.cpp
@ -225,7 +227,7 @@ else ()
Bindings/Bindings.cpp PROPERTIES COMPILE_FLAGS "/Yc\"string.h\" /Fp\"$(IntDir)/Bindings.pch\"" Bindings/Bindings.cpp PROPERTIES COMPILE_FLAGS "/Yc\"string.h\" /Fp\"$(IntDir)/Bindings.pch\""
) )
SET_SOURCE_FILES_PROPERTIES( SET_SOURCE_FILES_PROPERTIES(
"StackWalker.cpp LeakFinder.h" PROPERTIES COMPILE_FLAGS "/Yc\"Globals.h\"" "StackWalker.cpp LeakFinder.cpp" PROPERTIES COMPILE_FLAGS "/Yc\"Globals.h\""
) )
list(APPEND SOURCE "Resources/MCServer.rc") list(APPEND SOURCE "Resources/MCServer.rc")

2
src/main.cpp
View File

@ -182,7 +182,7 @@ int main( int argc, char **argv)
#if defined(_MSC_VER) && defined(_DEBUG) && defined(ENABLE_LEAK_FINDER) #if defined(_MSC_VER) && defined(_DEBUG) && defined(ENABLE_LEAK_FINDER)
InitLeakFinder(); InitLeakFinder();
#endif #endif
// Magic code to produce dump-files on Windows if the server crashes: // Magic code to produce dump-files on Windows if the server crashes:
#if defined(_WIN32) && !defined(_WIN64) && defined(_MSC_VER) #if defined(_WIN32) && !defined(_WIN64) && defined(_MSC_VER)
HINSTANCE hDbgHelp = LoadLibrary("DBGHELP.DLL"); HINSTANCE hDbgHelp = LoadLibrary("DBGHELP.DLL");