diff --git a/SConstruct b/SConstruct index c18222a317..ca154ed4cd 100644 --- a/SConstruct +++ b/SConstruct @@ -149,8 +149,13 @@ flavour = ARGUMENTS.get('flavor') if (flavour == 'debug'): compileFlags.append('-g') cppDefines.append('LOGGING') + cppDefines.append('_DEBUG') elif (flavour == 'devel'): compileFlags.append('-g') + cppDefines.append('DEBUGFAST') +elif (flavour == 'fastlog'): + compileFlags.append('-O3') + cppDefines.append('LOGGING') else: compileFlags.append('-O3') 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 #include #include 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); diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/Globals.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/Globals.cpp index be1fe31a54..6da6904d23 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/Globals.cpp +++ b/Source/Plugins/Plugin_DSP_LLE/Src/Globals.cpp @@ -42,7 +42,10 @@ char Msg[512]; if(sMsg.find("Mail") != -1 || sMsg.find("AX") != -1) // no match = -1 { + +#ifdef _WIN32 OutputDebugString(Msg); +#endif g_dspInitialize.pLog(Msg,0); } diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.h b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.h index 188d57e5fe..8207014ac1 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.h @@ -19,6 +19,7 @@ #define _PIXELSHADERMANAGER_H #include +#include #include "BPMemory.h" diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.h b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.h index 49ef0fb385..883b403a0f 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.h @@ -19,6 +19,7 @@ #define _VERTEXSHADERMANAGER_H #include +#include #include "GLUtil.h"