ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LogManager: Opt out of <wx/datetime.h> even if you have wx 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1765 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-01-04 16:52:28 +00:00
parent 034986a7ac
commit b7f1e937bb
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/Core/Common/Src/Common.h
View File

@ -24,24 +24,27 @@
#define CHECK_HEAP_INTEGRITY() #define CHECK_HEAP_INTEGRITY()
#ifdef _WIN32 #ifdef _WIN32
#ifdef _DEBUG #ifdef _DEBUG
#include <crtdbg.h> #include <crtdbg.h>
#undef CHECK_HEAP_INTEGRITY #undef CHECK_HEAP_INTEGRITY
#define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");} #define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");}
#endif #endif
/* Turn on logging with debugging, _DEBUG and DEBUGFAST are still added through /* Turn on logging with debugging, _DEBUG and DEBUGFAST are still added through
preprocessor definitions only */ preprocessor definitions only */
#if defined(_DEBUG) || defined(DEBUGFAST) #if defined(_DEBUG) || defined(DEBUGFAST)
#define LOGGING #define LOGGING
#endif #endif
#include "../../../PluginSpecs/CommonTypes.h" // Allow wxWidgets in Core
#define HAVE_WIIUSE 1 //#define WX_CORE
#define HAVE_WX 1
#include "../../../PluginSpecs/CommonTypes.h"
#define HAVE_WIIUSE 1
#define HAVE_WX 1
#else #else
#include "CommonTypes.h" #include "CommonTypes.h"
#include "Config.h" #include "Config.h"
#endif #endif
#include <stdlib.h> #include <stdlib.h>

8
Source/Core/Core/Src/LogManager.cpp
View File

@ -30,7 +30,7 @@
#include "PowerPC/SymbolDB.h" // for g_symbolDB #include "PowerPC/SymbolDB.h" // for g_symbolDB
#include "Debugger/Debugger_SymbolMap.h" #include "Debugger/Debugger_SymbolMap.h"
#if defined(HAVE_WX) && HAVE_WX // wxWidgets #if defined(HAVE_WX) && HAVE_WX && defined(WX_CORE) // wxWidgets
#include <wx/datetime.h> // for the timestamps #include <wx/datetime.h> // for the timestamps
#endif #endif
///////////////////////// /////////////////////////
@ -238,7 +238,7 @@ void LogManager::Log(LogTypes::LOG_TYPE _type, const char *_fmt, ...)
static u32 count = 0; static u32 count = 0;
char* Msg2 = (char*)alloca(strlen(_fmt)+512); char* Msg2 = (char*)alloca(strlen(_fmt)+512);
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX && defined(WX_CORE)
wxDateTime datetime = wxDateTime::UNow(); // get timestamp wxDateTime datetime = wxDateTime::UNow(); // get timestamp
#endif #endif
@ -272,13 +272,13 @@ void LogManager::Log(LogTypes::LOG_TYPE _type, const char *_fmt, ...)
const char *eol = "\n"; const char *eol = "\n";
if (Index > 0) if (Index > 0)
{ {
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX && defined(WX_CORE)
sprintf(Msg2, "%i %02i:%02i:%03i: %x %s (%s, %08x) : %s%s", sprintf(Msg2, "%i %02i:%02i:%03i: %x %s (%s, %08x) : %s%s",
#else #else
sprintf(Msg2, "%i %llu: %x %s (%s, %08x) : %s%s", sprintf(Msg2, "%i %llu: %x %s (%s, %08x) : %s%s",
#endif #endif
++count, ++count,
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX && defined(WX_CORE)
datetime.GetMinute(), datetime.GetSecond(), datetime.GetMillisecond(), datetime.GetMinute(), datetime.GetSecond(), datetime.GetMillisecond(),
#else #else
Common::Timer::GetTimeSinceJan1970(), Common::Timer::GetTimeSinceJan1970(),