diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-01-29 20:28:19 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-01-29 20:28:19 +0100 |
| commit | 89afb970d88e3efa8ddb2f1eafff10cd6525f2b7 (patch) | |
| tree | 206b3ba15c0fc87b3bf9ad7371f73887280945c4 /source/main.cpp | |
| parent | VC2008 compilation with new lua webplugin (diff) | |
| download | cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.gz cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.bz2 cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.lz cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.xz cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.zst cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.zip | |
Diffstat (limited to 'source/main.cpp')
| -rw-r--r-- | source/main.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/main.cpp b/source/main.cpp index cbe499281..37b3be5ac 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -1,21 +1,23 @@ -// Mem leak detection
-#include "MemoryLeak.h"
+
+#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "cRoot.h"
-#include "cMCLogger.h"
#include <exception> //std::exception
-#include <stdio.h> //printf
#include <csignal> //std::signal
#include <stdlib.h> //exit()
#include "SquirrelBindings.h"
#if USE_SQUIRREL
-#pragma warning(disable:4100;disable:4127;disable:4510;disable:4610;disable:4244;disable:4512) // Getting A LOT of these warnings from SqPlus
-#include <sqplus/sqplus.h>
-#pragma warning(default:4100;default:4127;default:4510;default:4610;default:4244;default:4512)
+ #pragma warning(disable:4100;disable:4127;disable:4510;disable:4610;disable:4244;disable:4512) // Getting A LOT of these warnings from SqPlus
+ #include <sqplus/sqplus.h>
+ #pragma warning(default:4100;default:4127;default:4510;default:4610;default:4244;default:4512)
#endif
+
+
+
+
void ShowCrashReport(int)
{
std::signal(SIGSEGV, SIG_DFL);
|