diff options
| author | nakeee <nakeee@gmail.com> | 2008-12-18 00:37:24 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2008-12-18 00:37:24 +0000 |
| commit | e6424f750b264fa374c1d533a9be959cfcf0c203 (patch) | |
| tree | e1b020ef2100cc7c2697a104461228e1ce22a2fe /Source/Core | |
| parent | 4a879698ac7125d3772b095d9cc90ba679e415ca (diff) | |
scons changes
added fastlog flavour with LOGGING and -O3
changed debug to include _DEBUG
changed devel to include DEBUGFAST
for now wxonassert is disabled as I couldn't make it work
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1571 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/Src/Common.h | 1 | ||||
| -rw-r--r-- | Source/Core/DebuggerWX/Src/CodeWindow.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/AboutDolphin.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/Main.cpp | 2 |
4 files changed, 5 insertions, 1 deletions
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index b88e5d0951..a02851fc35 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -42,6 +42,7 @@ #define HAVE_WIIUSE 1 #define HAVE_WX 1 #else +#define NDEBUG 1 // FIXME: this disable wx debugging how do we make it work? #include "CommonTypes.h" #include "Config.h" #endif diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DebuggerWX/Src/CodeWindow.cpp index b5caf52533..d0b91984cb 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindow.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindow.cpp @@ -15,6 +15,8 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ +#include "Common.h" + #include <wx/button.h> #include <wx/textctrl.h> #include <wx/textdlg.h> diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp index 503e9f18f4..50a11891cb 100644 --- a/Source/Core/DolphinWX/Src/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/Src/AboutDolphin.cpp @@ -14,6 +14,7 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ +#include "Common.h" #include "AboutDolphin.h" #include "svnrev.h" #include "CPUDetect.h" diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 093d4e9cba..4c442d9294 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -85,7 +85,7 @@ bool DolphinApp::OnInit() { DetectCPU(); -#ifdef _DEBUG +#if defined _DEBUG && defined _WIN32 int tmpflag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG); tmpflag |= _CRTDBG_DELAY_FREE_MEM_DF; _CrtSetDbgFlag(tmpflag); |