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

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')
 

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

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>

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"

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);

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);
 	}
 

Source/Plugins/Plugin_VideoOGL/Src/PixelShaderManager.h

@@ -19,6 +19,7 @@
 #define _PIXELSHADERMANAGER_H
 
 #include <map>
+#include <string>
 
 #include "BPMemory.h"
 

Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.h

@@ -19,6 +19,7 @@
 #define _VERTEXSHADERMANAGER_H
 
 #include <map>
+#include <string>
 
 #include "GLUtil.h"