more nowx fixes

disabled njoy test build


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

SConstruct

@@ -67,7 +67,7 @@ dirs = [
     'Source/Plugins/Plugin_DSP_NULL/Src',
     'Source/Plugins/Plugin_PadSimple/Src',
     'Source/Plugins/Plugin_nJoy_SDL/Src',
-    'Source/Plugins/Plugin_nJoy_Testing/Src',
+#    'Source/Plugins/Plugin_nJoy_Testing/Src',
     'Source/Plugins/Plugin_Wiimote/Src',
     'Source/Core/DolphinWX/Src',
     'Source/Core/DebuggerWX/Src',

Source/Plugins/Plugin_DSP_HLE/Src/Logging/Console.cpp

@@ -23,9 +23,12 @@
 #ifdef _WIN32
 #include <windows.h>
 #endif
+
+#if defined(HAVE_WX) && HAVE_WX
 #include "../Debugger/Debugger.h"
 
 extern CDebugger* m_frame;
+#endif
 
 // --------------------
 // On and off

Source/Plugins/Plugin_DSP_HLE/Src/SConscript

@@ -17,11 +17,6 @@ files = [
 	'Globals.cpp',
 	'PCHW/AOSoundStream.cpp',
 	'PCHW/Mixer.cpp',
-        'Debugger/Debugger.cpp',
-        'Debugger/PBView.cpp',
-        'Debugger/Mails.cpp',
-        'Debugger/Blocks.cpp',
-        'Logging/Logging.cpp',
         'Logging/Console.cpp',
 	'UCodes/UCode_AX.cpp',
         'UCodes/UCode_AXWii.cpp',
@@ -34,6 +29,17 @@ files = [
 	]
 
 dspenv = env.Clone()
+
+if dspenv['HAVE_WX']:
+    files += [
+        'Debugger/Debugger.cpp',
+        'Debugger/PBView.cpp',
+        'Debugger/Mails.cpp',
+        'Debugger/Blocks.cpp',
+        'Logging/Logging.cpp',
+
+        ]
+
 dspenv.Append(
 	CXXFLAGS = [ '-fPIC' ],
 	LIBS = [ 'common' ],

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

Source/Plugins/Plugin_DSP_HLE/Src/main.cpp

@@ -15,7 +15,13 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
+#include "Globals.h"
+#if defined(HAVE_WX) && HAVE_WX
+#include "Logging/Console.h" // for startConsoleWin, wprintf, GetConsoleHwnd
 #include "Debugger/Debugger.h" // for the CDebugger class
+CDebugger* m_frame;
+#endif
+
 #include "ChunkFile.h"
 #include "WaveFile.h"
 #include "resource.h"
@@ -32,7 +38,6 @@
 #include "DSPHandler.h"
 #include "Config.h"
 
-#include "Logging/Console.h" // for startConsoleWin, wprintf, GetConsoleHwnd
 
 DSPInitialize g_dspInitialize;
 u8* g_pMemory;
@@ -67,6 +72,7 @@ DSPState g_dspState;
 // ====================
 
 
+#if defined(HAVE_WX) && HAVE_WX
 //////////////////////////////////////////////////////////////////////////////////////////
 // wxWidgets - Some kind of stuff wx needs
 class wxDLLApp : public wxApp
@@ -80,7 +86,7 @@ class wxDLLApp : public wxApp
 IMPLEMENT_APP_NO_MAIN(wxDLLApp) 
 WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
 ///////////////////
-
+#endif
 
 #ifdef _WIN32
 HINSTANCE g_hInstance = NULL;
@@ -147,9 +153,10 @@ void CloseConsole()
 // know why it would be better. - There's a lockup problem with ShowModal(), but Show() doesn't work
 // because then DLL_PROCESS_DETACH is called immediately after DLL_PROCESS_ATTACH.
 // -------------------
-CDebugger* m_frame;
 void DllDebugger(HWND _hParent, bool Show)
 {
+#if defined(HAVE_WX) && HAVE_WX
+
 	if(m_frame && Show) // if we have created it, let us show it again
 	{
 		m_frame->DoShow();
@@ -163,6 +170,7 @@ void DllDebugger(HWND _hParent, bool Show)
 	{
 		m_frame->DoHide();
 	}
+#endif
 }
 // ===================
 
@@ -241,6 +249,7 @@ void DSP_Shutdown()
 #endif
 	CDSPHandler::Destroy();
 
+#if defined(HAVE_WX) && HAVE_WX
 	// Reset mails
 	if(m_frame)
 	{
@@ -249,6 +258,7 @@ void DSP_Shutdown()
 		m_frame->sMail.clear();
 		m_frame->sMailEnd.clear();
 	}
+#endif
 }
 
 void DSP_DoState(unsigned char **ptr, int mode) {

Source/Plugins/Plugin_DSP_HLE/Src/main.h

@@ -1 +1,3 @@
+#if defined(HAVE_WX) && HAVE_WX
 extern CDebugger* m_frame;
+#endif

Source/Plugins/Plugin_VideoOGL/Src/SConscript

@@ -33,8 +33,6 @@ files = [
 	'VertexShaderManager.cpp',
 	'TextureConverter.cpp',
 	'XFB.cpp',
-	'Logging/Console.cpp',
-	'Logging/Logging.cpp',
 	]
 compileFlags = [
 	'-fPIC',
@@ -52,6 +50,8 @@ if gfxenv['HAVE_WX']:
                 'GUI/ConfigDlg.cpp',
                 'Debugger/Debugger.cpp',
                 'Debugger/PBView.cpp',
+                'Logging/Console.cpp',
+                'Logging/Logging.cpp',
                 ]
 
 if gfxenv['HAVE_COCOA']:

Source/Plugins/Plugin_VideoOGL/Src/main.cpp

@@ -23,6 +23,7 @@
 
 #if defined(HAVE_WX) && HAVE_WX
 #include "GUI/ConfigDlg.h"
+#include "Debugger/Debugger.h" // for the CDebugger class
 #endif
 
 #include "Config.h"
@@ -44,9 +45,7 @@
 #include "TextureConverter.h"
 
 #include "VideoState.h"
-#if defined(HAVE_WX) && HAVE_WX 
+
-#include "Debugger/Debugger.h" // for the CDebugger class
-#endif
 SVideoInitialize g_VideoInitialize;
 
 
@@ -155,8 +154,9 @@ void DllConfig(HWND _hParent)
         g_Config.Load();
         frame.ShowModal()
 ;
-#elif defined(HAVE_X11) && HAVE_X11
+#elif defined(HAVE_X11) && HAVE_X11 && defined(HAVE_XXF86VM) &&\ 
-#if defined(HAVE_XXF86VM) && HAVE_XXF86VM
+        HAVE_XXF86VM && defined(HAVE_WX) && HAVE_WX
+ 
 	ConfigDialog frame(NULL);
 	g_Config.Load();
     int glxMajorVersion, glxMinorVersion;
@@ -191,7 +191,6 @@ void DllConfig(HWND _hParent)
 	XFree(modes);
 	frame.ShowModal();
 #endif
-#endif
 }
 
 void Video_Initialize(SVideoInitialize* _pVideoInitialize)

Source/Plugins/Plugin_Wiimote/Src/SConscript

@@ -8,16 +8,19 @@ name = "Plugin_Wiimote"
 
 files = [
         "Config.cpp",
-        "ConfigDlg.cpp",
-        "Console.cpp",
         "DataReports.cpp",
         "EmuDefinitions.cpp",
         "EmuMain.cpp",
         "EmuSubroutines.cpp",
         "Encryption.cpp",
-        "FillReport.cpp",
         "main.cpp",
 	]
+if wmenv['HAVE_WX']:
+    files += [
+        "ConfigDlg.cpp",
+        "Console.cpp",
+        "FillReport.cpp",
+        ]
 
 libs = [ 'common' ]
 

Source/Plugins/Plugin_Wiimote/Src/main.cpp

@@ -41,6 +41,7 @@ bool g_UseRealWiiMote = false;
 
 HINSTANCE g_hInstance;
 
+#if defined(HAVE_WX) && HAVE_WX
 class wxDLLApp : public wxApp
 {
 	bool OnInit()
@@ -51,6 +52,7 @@ class wxDLLApp : public wxApp
 IMPLEMENT_APP_NO_MAIN(wxDLLApp) 
 
 WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
+#endif
 
 #ifdef _WIN32
 BOOL APIENTRY DllMain(HINSTANCE hinstDLL,	// DLL module handle
@@ -113,6 +115,7 @@ extern "C" void DllAbout(HWND _hParent)
 
 extern "C" void DllConfig(HWND _hParent)
 {
+#if defined(HAVE_WX) && HAVE_WX
 	wxWindow win;
 #ifdef _WIN32
 	win.SetHWND(_hParent);
@@ -122,6 +125,7 @@ extern "C" void DllConfig(HWND _hParent)
 #ifdef _WIN32
 	win.SetHWND(0);
 #endif
+#endif
 }
 
 extern "C" void Wiimote_Initialize(SWiimoteInitialize _WiimoteInitialize)

Source/Plugins/Plugin_nJoy_SDL/Src/SConscript

@@ -4,6 +4,7 @@ Import('env')
 import sys
 
 name = "Plugin_nJoy_SDL"
+padenv = env.Clone()
 
 if not env['HAVE_SDL']:
     print name + " must have SDL to be build"
@@ -11,11 +12,13 @@ if not env['HAVE_SDL']:
 
 files = [
 	'nJoy.cpp',
-	'GUI/AboutBox.cpp',
-	'GUI/ConfigBox.cpp',
 	]
+if padenv['HAVE_WX']:
+    files += [
+        'GUI/AboutBox.cpp',
+        'GUI/ConfigBox.cpp',
+        ]
 
-padenv = env.Clone()
 padenv.Append(
 	CXXFLAGS = [ '-fPIC' ],
 	LIBS = [ 'common' ],

Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp

@@ -71,12 +71,17 @@ HRESULT SetDeviceForcesXY();
 #endif
 
 #elif defined(__linux__)
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
 	int fd;
 	char device_file_name[64];
 	struct ff_effect effect;
 	bool CanRumble = false;
 #endif
 
+#if defined(HAVE_WX) && HAVE_WX
 //////////////////////////////////////////////////////////////////////////////////////////
 // wxWidgets
 // ¯¯¯¯¯¯¯¯¯
@@ -90,7 +95,7 @@ class wxDLLApp : public wxApp
 
 IMPLEMENT_APP_NO_MAIN(wxDLLApp) 
 WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
-
+#endif
 //////////////////////////////////////////////////////////////////////////////////////////
 // DllMain 
 // ¯¯¯¯¯¯¯
@@ -176,9 +181,10 @@ void DllConfig(HWND _hParent)
 	}
 
 	LoadConfig();	// load settings
-
+#if defined(HAVE_WX) && HAVE_WX
 	ConfigBox frame(NULL);
 	frame.ShowModal();
+#endif
 	#endif	
 }
 

Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h

@@ -32,6 +32,7 @@
 // Set this if you want to use the rumble 'hack' for controller one
 //#define USE_RUMBLE_DINPUT_HACK
 
+#include "Common.h"
 #ifdef _WIN32
 #define _CRT_SECURE_NO_WARNINGS
 #define DIRECTINPUT_VERSION 0x0800
@@ -61,8 +62,10 @@
 #include <linux/input.h>
 #endif
 
+#if defined(HAVE_WX) && HAVE_WX
 #include "GUI/AboutBox.h"
 #include "GUI/ConfigBox.h"
+#endif
 
 #include "Common.h"
 #include "pluginspecs_pad.h"