more nowx fixes

disabled njoy test build


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1545 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp

@@ -17,9 +17,11 @@
 
 #include "FileUtil.h" // for IsDirectory
 #include "StringUtil.h" // for StringFromFormat
+#if defined(HAVE_WX) && HAVE_WX
 #include "../Debugger/Debugger.h"
 #include "../Logging/Console.h" // for aprintf
-
+extern CDebugger* m_frame;
+#endif
 #include <sstream>
 
 #ifdef _WIN32
@@ -46,7 +48,7 @@ extern bool gSequenced;
 extern bool gVolume;
 extern bool gReset;
 extern std::string gpName;
-extern CDebugger* m_frame;
+
 std::vector<std::string> sMailLog, sMailTime;
 // -----------
 
@@ -100,10 +102,12 @@ void CUCode_AX::SaveLogFile(std::string f, int resizeTo, bool type, bool Wii)
 // ----------------
 void CUCode_AX::SaveLog_(bool Wii, const char* _fmt, va_list ap)
 {
+    char Msg[512];
+    vsprintf(Msg, _fmt, ap);
+
+#if defined(HAVE_WX) && HAVE_WX
 if(m_frame->ScanMails)
 {	
-	char Msg[512];
-	vsprintf(Msg, _fmt, ap);
 
 	//wxMessageBox( wxString::Format("SaveLog_ again: %s\n", Msg) );
 	
@@ -146,11 +150,14 @@ if(m_frame->ScanMails)
 	}
 	else
 	{
+#endif
 		TmpMailLog += Msg;
 		TmpMailLog += "\n";
 		LOG_(1, Msg); // also write it to the log
+#if defined(HAVE_WX) && HAVE_WX
 	}
 }
+#endif
 }
 // ----------------
 
@@ -160,6 +167,7 @@ if(m_frame->ScanMails)
 // ----------------
 void CUCode_AX::SaveMail(bool Wii, u32 _uMail)
 {
+#if defined(HAVE_WX) && HAVE_WX
 if(m_frame->ScanMails)
 {
 	int i = 0;
@@ -248,6 +256,7 @@ if(m_frame->ScanMails)
 	sTemp = "";
 	sTempEnd = "";
 }
+#endif
 }
 // ----------------
 
@@ -319,12 +328,14 @@ void CUCode_AX::MixAdd(short* _pBuffer, int _iSize)
 	memset(templbuffer, 0, _iSize * sizeof(int));
 	memset(temprbuffer, 0, _iSize * sizeof(int));
 
+#if defined(HAVE_WX) && HAVE_WX
 	// write logging data to debugger
 	if (m_frame)
 	{
 		CUCode_AX::Logging(_pBuffer, _iSize, 0, false);
 	}
 	
+#endif
 	// ---------------------------------------------------------------------------------------
 	/* Make the updates we are told to do. When there are multiple updates for a block they
 	   are placed in memory directly following updaddr. They are mostly for initial time
@@ -389,11 +400,13 @@ void CUCode_AX::MixAdd(short* _pBuffer, int _iSize)
 		*_pBuffer++ = right;
 	}
 
+#if defined(HAVE_WX) && HAVE_WX
 	// write logging data to debugger again after the update
 	if (m_frame)
 	{
 		CUCode_AX::Logging(_pBuffer, _iSize, 1, false);
 	}
+#endif
 }
 
 
@@ -433,7 +446,11 @@ void CUCode_AX::Update()
 // Shortcut to avoid having to write SaveLog(false, ...) every time
 void CUCode_AX::SaveLog(const char* _fmt, ...)
 {
-	va_list ap; va_start(ap, _fmt); if(m_frame) SaveLog_(false, _fmt, ap); va_end(ap);
+#if defined(HAVE_WX) && HAVE_WX
+	va_list ap; va_start(ap, _fmt); 
+	if(m_frame) SaveLog_(false, _fmt, ap); 
+	va_end(ap);
+#endif
 }
 
 
@@ -465,8 +482,9 @@ bool CUCode_AX::AXTask(u32& _uMail)
 
 	bool bExecuteList = true;
 
+#if defined(HAVE_WX) && HAVE_WX
 	if(m_frame) SaveMail(false, _uMail); // Save mail for debugging
-
+#endif
 	while (bExecuteList)
 	{
 		static int last_valid_command = 0;

Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.h

@@ -19,6 +19,7 @@
 #define _UCODE_AX
 
 #include <iostream>
+#include "pluginspecs_dsp.h"
 #include "UCode_AXStructs.h"
 
 enum

Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AXWii.cpp

@@ -17,8 +17,11 @@
 
 #include "StringUtil.h"
 
+#if defined(HAVE_WX) && HAVE_WX
 #include "../Debugger/Debugger.h"
 #include "../Logging/Console.h" // for aprintf
+extern CDebugger * m_frame;
+#endif 
 
 #ifdef _WIN32
 #include "../PCHW/DSoundStream.h"
@@ -40,7 +43,7 @@
 // Declarations
 // -----------
 extern bool gSequenced;
-extern CDebugger * m_frame;
+
 // -----------
 
 
@@ -112,6 +115,7 @@ void CUCode_AXWii::MixAdd_(short* _pBuffer, int _iSize, ParamBlockType &PBs)
 
 	// -------------------------------------------
 	// write logging data to debugger
+#if defined(HAVE_WX) && HAVE_WX
 	if (m_frame)
 	{
 		lCUCode_AX->Logging(_pBuffer, _iSize, 0, true);
@@ -151,7 +155,7 @@ void CUCode_AXWii::MixAdd_(short* _pBuffer, int _iSize, ParamBlockType &PBs)
 		}
 	}
 	// -----------------
-
+#endif
 
 	// ---------------------------------------------------------------------------------------
 	/* Make the updates we are told to do. See comments to the GC version in UCode_AX.cpp */
@@ -214,11 +218,13 @@ void CUCode_AXWii::MixAdd_(short* _pBuffer, int _iSize, ParamBlockType &PBs)
 		*_pBuffer++ = right;
 	}
 
+#if defined(HAVE_WX) && HAVE_WX
 	// write logging data to debugger again after the update
 	if (m_frame)
 	{
 		lCUCode_AX->Logging(_pBuffer, _iSize, 1, true);
 	}
+#endif
 }
 
 
@@ -235,7 +241,13 @@ void CUCode_AXWii::Update()
 // Shortcut
 void CUCode_AXWii::SaveLog(const char* _fmt, ...)
 {
-	va_list ap; va_start(ap, _fmt); if(m_frame) lCUCode_AX->SaveLog_(true, _fmt, ap); va_end(ap);
+#if defined(HAVE_WX) && HAVE_WX
+	va_list ap; 
+	va_start(ap, _fmt); 
+	if(m_frame) 
+	    lCUCode_AX->SaveLog_(true, _fmt, ap); 
+	va_end(ap);
+#endif
 }
 
 
@@ -261,9 +273,9 @@ bool CUCode_AXWii::AXTask(u32& _uMail)
         //	u32 Addr__9;
 
 	bool bExecuteList = true;
-
+#if defined(HAVE_WX) && HAVE_WX
 	if(m_frame) lCUCode_AX->SaveMail(true, uAddress); // Save mail for debugging
-
+#endif
 	if (false) 
 	{
 		// PanicAlert("%i", sizeof(AXParamBlockWii));  // 252 ??

Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_ADPCM.h

@@ -17,6 +17,7 @@
 
 #ifndef _UCODE_AX_ADPCM_H
 #define _UCODE_AX_ADPCM_H
+#include "../Globals.h"
 
 inline s16 ADPCM_Step(PBADPCMInfo &adpcm, u32& samplePos, u32 newSamplePos, u16 frac)
 {