Buildsystem: Removed unused MemoryLeaks files

Buildsystem/Windows: WheatyExceptionReport is now build in worldserver and authserver instead of shared (fixes crash reports not being generated)

--HG--
branch : trunk

8 files changed, 10 insertions, 83 deletions

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index d37d2fe80f3..439645bf5cb 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -17,6 +17,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 endif()
 
 if( SERVERS )
+  set(sources_Debugging
+    ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging/WheatyExceptionReport.cpp
+    ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging/WheatyExceptionReport.h
+  )
   add_subdirectory(shared)
   add_subdirectory(game)
   add_subdirectory(collision)
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 9af38dd89f6..6dc0089dddc 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -25,6 +25,7 @@ set(authserver_SRCS
 if( WIN32 )
 set(authserver_SRCS
     ${authserver_SRCS}
+    ${sources_Debugging}
     authserver.rc
 )
 endif()
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index eab3ebee95d..cd053f35bbf 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -12,7 +12,6 @@ file(GLOB_RECURSE sources_Configuration Configuration/*.cpp Configuration/*.h)
 file(GLOB_RECURSE sources_Cryptography Cryptography/*.cpp Cryptography/*.h)
 file(GLOB_RECURSE sources_Database Database/*.cpp Database/*.h)
 file(GLOB_RECURSE sources_DataStores DataStores/*.cpp DataStores/*.h)
-file(GLOB_RECURSE sources_Debugging Debugging/*.cpp Debugging/*.h)
 file(GLOB_RECURSE sources_Dynamic Dynamic/*.cpp Dynamic/*.h)
 file(GLOB_RECURSE sources_Logging Logging/*.cpp Logging/*.h)
 file(GLOB_RECURSE sources_Packets Packets/*.cpp Packets/*.h)
@@ -30,13 +29,13 @@ set(shared_STAT_SRCS
   ${sources_Cryptography}
   ${sources_Database}
   ${sources_DataStores}
-  ${sources_Debugging}
   ${sources_Dynamic}
   ${sources_Logging}
   ${sources_Packets}
   ${sources_Threading}
   ${sources_Utilities}
   ${sources_localdir}
+  Debugging/Errors.h
 )
 
 include_directories(
diff --git a/src/server/shared/Debugging/MemoryLeaks.cpp b/src/server/shared/Debugging/MemoryLeaks.cpp
deleted file mode 100644
index c591dabb866..00000000000
--- a/src/server/shared/Debugging/MemoryLeaks.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "MemoryLeaks.h"
-
-MemoryManager::MemoryManager( )
-{
-    #if COMPILER == MICROSOFT
-    // standard leak check initialization
-    //_CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
-    // uncomment to disable Visual Leak Detector from code
-    //VLDDisable();
-    #endif
-}
diff --git a/src/server/shared/Debugging/MemoryLeaks.h b/src/server/shared/Debugging/MemoryLeaks.h
deleted file mode 100644
index 4b13e4d3d90..00000000000
--- a/src/server/shared/Debugging/MemoryLeaks.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef TRINITYSERVER_MEMORY_H
-#define TRINITYSERVER_MEMORY_H
-
-#include "shared/CompilerDefs.h"
-
-#if COMPILER == COMPILER_MICROSOFT
-
-#ifndef _WIN64
-// Visual Leak Detector support enabled
-//#include <vld/vld.h>
-// standard Visual Studio leak check disabled,
-//#  define _CRTDBG_MAP_ALLOC
-//#  include <stdlib.h>
-//#  include <crtdbg.h>
-#else
-//#  define _CRTDBG_MAP_ALLOC
-//#  include <stdlib.h>
-//#  include <crtdbg.h>
-#endif
-
-#endif
-
-
-#include "ace/Singleton.h"
-
-struct MemoryManager
-{
-    MemoryManager();
-};
-#define sMemoryManager ACE_Singleton<MemoryManager, ACE_Null_Mutex>::instance()
-#endif
diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp
index ebc6a701996..7a3eae0f408 100644
--- a/src/server/shared/Debugging/WheatyExceptionReport.cpp
+++ b/src/server/shared/Debugging/WheatyExceptionReport.cpp
@@ -3,7 +3,7 @@
 // MSDN Magazine, 2002
 // FILE: WheatyExceptionReport.CPP
 //==========================================
-#ifdef _WIN32
+#if PLATFORM == PLATFORM_WINDOWS
 #define WIN32_LEAN_AND_MEAN
 #pragma warning(disable:4996)
 #pragma warning(disable:4312)
@@ -18,7 +18,7 @@
 #include "SystemConfig.h"
 #include "revision.h"
 #define CrashFolder _T("Crashes")
-//#pragma comment(linker, "/defaultlib:dbghelp.lib")
+#pragma comment(linker, "/DEFAULTLIB:dbghelp.lib")
 
 inline LPTSTR ErrorMessage(DWORD dw)
 {
diff --git a/src/server/shared/Debugging/WheatyExceptionReport.h b/src/server/shared/Debugging/WheatyExceptionReport.h
index e9af3f21d24..228d260e57d 100644
--- a/src/server/shared/Debugging/WheatyExceptionReport.h
+++ b/src/server/shared/Debugging/WheatyExceptionReport.h
@@ -1,7 +1,7 @@
 #ifndef _WHEATYEXCEPTIONREPORT_
 #define _WHEATYEXCEPTIONREPORT_
 
-#ifdef _WIN32
+#if PLATFORM == PLATFORM_WINDOWS
 
 #include <dbghelp.h>
 
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index d73a25f2354..eed999ccba7 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -25,6 +25,7 @@ set(worldserver_SRCS
 if( WIN32 )
   set(worldserver_SRCS
     ${worldserver_SRCS}
+    ${sources_Debugging}
     worldserver.rc
   )
 endif()