Reverted r762 and r763 - i don't see any good reason to keep this revision as long as nobody fixes the windows build (btw: i don't understand why we need a non-WX build at all). if someone is going to fix it he can revert this revision.

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

20 files changed, 105 insertions, 142 deletions

diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index e64e3932f5..43ca8d25e1 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -24,16 +24,15 @@
 #define CHECK_HEAP_INTEGRITY()

 

 #ifdef _WIN32

-	#define USE_WX // Always define in Windows since it isn't tested.

-	#ifdef _DEBUG

-		#include <crtdbg.h>

-		#undef CHECK_HEAP_INTEGRITY

-		#define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");}

-	#endif

-

-	#include "../../../PluginSpecs/CommonTypes.h"

+#ifdef _DEBUG

+#include <crtdbg.h>

+#undef CHECK_HEAP_INTEGRITY

+#define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");}

+#endif

+

+#include "../../../PluginSpecs/CommonTypes.h"

 #else

-	#include "CommonTypes.h"

+#include "CommonTypes.h"

 #endif

 

 #include <stdlib.h>

@@ -42,45 +41,45 @@
 

 // Function Cross-Compatibility

 #ifdef _WIN32

-	#define strcasecmp _stricmp

-	#define unlink _unlink

+#define strcasecmp _stricmp

+#define unlink _unlink

 #else

-	#define _stricmp strcasecmp

-	#define _unlink unlink

+#define _stricmp strcasecmp

+#define _unlink unlink

 #endif

 

 #ifdef _WIN32

-	#ifdef _WIN32

-		#define fseek _fseeki64

-		#define ftell _ftelli64

-	#endif

-

-	#define POSIX 0

-	#define NOMINMAX

-

-	#if _M_IX86

-		#define Crash() {__asm int 3}

-	#else

-		#if _MSC_VER > 1000

-			extern "C" {

-				__declspec(dllimport) void __stdcall DebugBreak(void);

-			}

-			#define Crash() {DebugBreak();}

-		#else

-			#error fixme

-		#endif

-	#endif

+#ifdef _WIN32

+#define fseek _fseeki64

+#define ftell _ftelli64

+#endif

+

+#define POSIX 0

+#define NOMINMAX

+

+#if _M_IX86

+#define Crash() {__asm int 3}

+#else

+#if _MSC_VER > 1000

+extern "C" {

+	__declspec(dllimport) void __stdcall DebugBreak(void);

+}

+#define Crash() {DebugBreak();}

+#else

+#error fixme

+#endif

+#endif

 

 #elif __GNUC__

-	#define POSIX 1

-	#define MAX_PATH 260

-	#define stricmp strcasecmp

-	#define Crash() {asm ("int $3");}

-	#ifdef _LP64

-		#define _M_X64 1

-	#else

-		#define _M_IX86 1

-	#endif

+#define POSIX 1

+#define MAX_PATH 260

+#define stricmp strcasecmp

+#define Crash() {asm ("int $3");}

+#ifdef _LP64

+#define _M_X64 1

+#else

+#define _M_IX86 1

+#endif

 #endif

 

 // Alignment

diff --git a/Source/Core/DolphinWX/Src/BootManager.cpp b/Source/Core/DolphinWX/Src/BootManager.cpp
index 3a70652a1b..2bb708716d 100644
--- a/Source/Core/DolphinWX/Src/BootManager.cpp
+++ b/Source/Core/DolphinWX/Src/BootManager.cpp
@@ -27,20 +27,15 @@
 #include "VolumeCreator.h"

 #include "Config.h"

 #include "Core.h"

-

-#ifdef USE_WX

 #include "Frame.h"

 #include "CodeWindow.h"

-#endif

 

 static std::string s_DataBasePath_EUR = "Data_EUR";

 static std::string s_DataBasePath_USA = "Data_USA";

 static std::string s_DataBasePath_JAP = "Data_JAP";

 

-#ifdef USE_WX

 extern CFrame* main_frame;

 extern CCodeWindow* g_pCodeWindow;

-#endif

 

 namespace BootManager

 {

@@ -51,8 +46,7 @@ extern "C" HINSTANCE wxGetInstance();
 bool BootCore(const std::string& _rFilename)

 {

 	SCoreStartupParameter StartUp = SConfig::GetInstance().m_LocalCoreStartupParameter;

-	

-	#ifdef USE_WX

+

 	if (g_pCodeWindow)

 	{

 //		StartUp.bUseDualCore = code_frame->UseDualCore();

@@ -63,16 +57,11 @@ bool BootCore(const std::string& _rFilename)
 //		StartUp.bUseDualCore = false;

 //		StartUp.bUseJIT = true;

 	}

-	#endif

 	StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO;

 	StartUp.m_strFilename = _rFilename;

 	StartUp.bRunCompareClient = false;

 	StartUp.bRunCompareServer = false;

-	#ifdef USE_WX

 	StartUp.bEnableDebugging = g_pCodeWindow ? true : false; // RUNNING_DEBUG

-	#else

-	StartUp.bEnableDebugging = false;

-	#endif

 	std::string BaseDataPath;

 #ifdef _WIN32

 	StartUp.hInstance = wxGetInstance();

@@ -95,10 +84,8 @@ bool BootCore(const std::string& _rFilename)
 		ini.Get("Core", "SkipIdle", &StartUp.bSkipIdle, StartUp.bSkipIdle);

 		ini.Get("Core", "OptimizeQuantizers", &StartUp.bOptimizeQuantizers, StartUp.bOptimizeQuantizers);

 	}

-	#ifdef USE_WX

 	if(main_frame)

 		StartUp.hMainWindow = main_frame->GetRenderHandle();

-	#endif

 

 	// init the core

 	if (!Core::Init(StartUp))

@@ -106,12 +93,8 @@ bool BootCore(const std::string& _rFilename)
 		PanicAlert("Couldn't init the core.\nCheck your configuration.");

 		return(false);

 	}

-	

-	#ifdef USE_WX

+

 	Core::SetState(g_pCodeWindow ? Core::CORE_PAUSE : Core::CORE_RUN);

-	#else

-	Core::SetState(Core::CORE_RUN);

-	#endif

 	return(true);

 }

 

diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h
index b07c89f7cb..883d6f96b3 100644
--- a/Source/Core/DolphinWX/Src/Globals.h
+++ b/Source/Core/DolphinWX/Src/Globals.h
@@ -78,7 +78,7 @@ enum
 	ID_TOOLBAR = 500,

 	LIST_CTRL = 1000

 };

-#ifdef USE_WX

+

 #define wxUSE_XPM_IN_MSW 1

 #define USE_XPM_BITMAPS 1

 

@@ -125,5 +125,5 @@ enum
 		),

 

 extern const wxEventType wxEVT_HOST_COMMAND;

-#endif

+

 #endif

diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp
index d08bc9cb3d..44a6028474 100644
--- a/Source/Core/DolphinWX/Src/ISOFile.cpp
+++ b/Source/Core/DolphinWX/Src/ISOFile.cpp
@@ -67,7 +67,6 @@ GameListItem::GameListItem(const std::string& _rFileName)
 					pBannerLoader->GetDescription(m_Description);

 					if (pBannerLoader->GetBanner(g_ImageTemp))

 					{

-						#ifdef USE_WX

 						unsigned char* pImage = (unsigned char*)malloc(DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT * 3);

 

 						for (size_t i = 0; i < DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT; i++)

@@ -78,7 +77,6 @@ GameListItem::GameListItem(const std::string& _rFileName)
 						}

 

 						m_Image.Create(DVD_BANNER_WIDTH, DVD_BANNER_HEIGHT, pImage);

-						#endif

 					}

 				}

 				else

diff --git a/Source/Core/DolphinWX/Src/ISOFile.h b/Source/Core/DolphinWX/Src/ISOFile.h
index c241f7eddc..f404723afc 100644
--- a/Source/Core/DolphinWX/Src/ISOFile.h
+++ b/Source/Core/DolphinWX/Src/ISOFile.h
@@ -36,9 +36,7 @@ public:
 	bool IsCompressed() const {return m_BlobCompressed;}

 	u64 GetFileSize() const {return m_FileSize;}

 	u64 GetVolumeSize() const {return m_VolumeSize;}

-	#ifdef USE_WX

 	const wxImage& GetImage() const {return m_Image;}

-	#endif

 

 private:

 	std::string m_FileName;

@@ -52,9 +50,7 @@ private:
 

 	DiscIO::IVolume::ECountry m_Country;

 

-	#ifdef USE_WX

 	wxImage m_Image;

-	#endif

 

 	bool m_Valid;

 

diff --git a/Source/Core/DolphinWX/Src/MainNoGUI.cpp b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
index 4cb8dbf90d..9557fe5f0e 100644
--- a/Source/Core/DolphinWX/Src/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/Src/MainNoGUI.cpp
@@ -1,7 +1,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
-
 #ifndef _WIN32
 //#include <curses.h>
 #else
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index c512798a26..64c893651d 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -6,19 +6,22 @@ import sys
 files = [
 	'BootManager.cpp',
 	'Config.cpp',
+	'ConfigMain.cpp',
 	'FileSearch.cpp',
+	'FilesystemViewer.cpp',
+	'Frame.cpp',
+	'GameListCtrl.cpp',
 	'Globals.cpp',
 	'ISOFile.cpp',
+	'MemcardManager.cpp',
 	'MemoryCards/GCMemcard.cpp',
+	'PluginManager.cpp',
 	'stdafx.cpp',
 	'cmdline.c',
 	]
 libs = [
-	'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
+	'debwx', 'core', 'minilzo', 'discio', 'bdisasm', 'videocommon', 'common', 'z'
 	]
-if not env['nowx']:
-	files += ['ConfigMain.cpp', 'FilesystemViewer.cpp', 'Frame.cpp', 'GameListCtrl.cpp', 'MemcardManager.cpp', 'PluginManager.cpp',]
-	libs += ['debwx', ]
 
 wxenv = env.Clone()
 wxenv.Append(
@@ -27,7 +30,7 @@ wxenv.Append(
 		'wxNEEDS_CHARPP',
 		],
 	LINKFLAGS = [
-		'-lpthread',
+		'-pthread',
 		],
 	LIBS = libs
 	)
@@ -61,6 +64,5 @@ else:
 	exeNoGUI = '../../../../Binary/linux/DolphinNoGUI'
 
 objects = [ wxenv.Object(srcFile) for srcFile in files ]
-if not env['nowx']:
-	wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])	
+wxenv.Program(exeGUI, objects + [ 'Main.cpp' ])
 wxenv.Program(exeNoGUI, objects + [ 'MainNoGUI.cpp' ])
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp
index 1d304cfb26..58985ced11 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp
@@ -42,7 +42,7 @@
 

 // Externals

 

-extern float ratioFactor; // a global to get the ratio factor from MixAdd

+float ratioFactor; // a global to get the ratio factor from MixAdd

 int gUpdFreq = 5;

 u32 gLastBlock;

 

diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
index ca050329c0..34408db767 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript
@@ -16,6 +16,9 @@ files = [
 	'Globals.cpp',
 	'PCHW/AOSoundStream.cpp',
 	'PCHW/Mixer.cpp',
+        'Debugger/Debugger.cpp',
+        'Debugger/PBView.cpp',
+        'Logging/Logging.cpp',
 	'UCodes/UCode_AX.cpp',
 	'UCodes/UCode_CARD.cpp',
 	'UCodes/UCode_InitAudioSystem.cpp',
@@ -24,8 +27,6 @@ files = [
 	'UCodes/UCodes.cpp',
 	'UCodes/UCode_Zelda.cpp',
 	]
-if not env['nowx']:
-	files += ['Debugger/Debugger.cpp', 'Debugger/PBView.cpp', 'Logging/Logging.cpp',]
 
 dspenv = env.Clone()
 dspenv.Append(
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
index ac1da01827..d436e3aaa7 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
@@ -27,17 +27,14 @@
 #include "UCode_AXStructs.h"

 #include "UCode_AX.h"

 

-#ifdef USE_WX

 #include "../Debugger/Debugger.h"

-#endif

-

-float ratioFactor;

-

+// ---------------------------------------------------------------------------------------

 // Externals

+// -----------

+extern float ratioFactor;

 extern u32 gLastBlock;

-#ifdef USE_WX

 extern CDebugger* m_frame;

-#endif

+// -----------

 

 CUCode_AX::CUCode_AX(CMailHandler& _rMailHandler, bool wii)

 	: IUCode(_rMailHandler)

@@ -143,12 +140,10 @@ void CUCode_AX::MixAdd(short* _pBuffer, int _iSize)
 #endif

 

 	// write logging data to debugger

-	#ifdef USE_WX

 	if(m_frame)

 	{

 		CUCode_AX::Logging(_pBuffer, _iSize, 0);

 	}

-	#endif

 

 

 	for (int i = 0; i < numberOfPBs; i++)

diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
index ebe17dae85..a76c2fc5ed 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
@@ -15,7 +15,10 @@
 // Official SVN repository and contact information can be found at

 // http://code.google.com/p/dolphin-emu/

 

+

+// =======================================================================================

 // Includes

+// ------------------

 #include "Globals.h"

 #include "ChunkFile.h"

 #include "resource.h"

@@ -33,12 +36,14 @@
 #include "DSPHandler.h"

 #include "Config.h"

 

-#ifdef USE_WX

 #include "Debugger/Debugger.h" // for the CDebugger class

 #include "Logging/Console.h" // for startConsoleWin, wprintf, GetConsoleHwnd

-#endif

+// ===================

+

 

+// =======================================================================================

 // DSP struct

+// -------------------

 DSPInitialize g_dspInitialize;

 u8* g_pMemory;

 

@@ -63,9 +68,12 @@ struct DSPState
 };

 

 DSPState g_dspState;

+// ====================

 

-#ifdef USE_WX

+

+//////////////////////////////////////////////////////////////////////////////////////////

 // wxWidgets - Some kind of stuff wx needs

+// ŻŻŻŻŻŻŻŻŻ

 class wxDLLApp : public wxApp

 {

 	bool OnInit()

@@ -76,7 +84,8 @@ class wxDLLApp : public wxApp
 

 IMPLEMENT_APP_NO_MAIN(wxDLLApp) 

 WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);

-#endif

+///////////////////

+

 

 #ifdef _WIN32

 HINSTANCE g_hInstance = NULL;

@@ -117,7 +126,9 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle
 #endif

 

 

+// =======================================================================================

 // Open and close console

+// -------------------

 void OpenConsole()

 {

 	#if defined (_WIN32)

@@ -134,21 +145,22 @@ void CloseConsole()
 		FreeConsole();

 	#endif

 }

+// ===================

 

+

+// =======================================================================================

 // Create debugging window - We could use use wxWindow win; new CDebugger(win) like nJoy but I don't

 // 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.

-#ifdef USE_WX

+// -------------------

 CDebugger* m_frame;

-#endif

-

 void DllDebugger(HWND _hParent)

 {

-	#ifdef USE_WX

 	m_frame = new CDebugger(NULL);

 	m_frame->ShowModal();

-	#endif

 }

+// ===================

+

 

 void GetDllInfo(PLUGIN_INFO* _PluginInfo)

 {

diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
index 0362dce52b..e2d126e12c 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
+++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
@@ -21,18 +21,14 @@
 
 #include <stdio.h>
 #include <math.h>
-#ifdef USE_WX
 #include <wx/aboutdlg.h>
-#endif
 
 #include "Common.h"
 #include "pluginspecs_pad.h"
 #include "PadSimple.h"
 #include "IniFile.h"
 
-#ifdef USE_WX
 #include "GUI/ConfigDlg.h"
-#endif
 
 #ifdef XINPUT_ENABLE
 #include "XInput.h"
@@ -170,20 +166,17 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
 
 void DllAbout(HWND _hParent)
 {
-	#ifdef USE_WX
 	wxAboutDialogInfo info;
 	info.AddDeveloper(_T("ector"));
 	info.AddDeveloper(_T("F|RES"));
 	info.SetDescription(_T("Simple keyboard and XInput plugin for dolphin"));
 	wxAboutBox(info);
-	#endif
 }
 
 
 void DllConfig(HWND _hParent)
 {
 	LoadConfig();
-#ifdef USE_WX
 #ifdef _WIN32
 	wxWindow win;
 	win.SetHWND(_hParent);
@@ -195,7 +188,6 @@ void DllConfig(HWND _hParent)
 	ConfigDialog frame(NULL);
 	frame.ShowModal();
 #endif
-#endif
 	SaveConfig();
 }
 
diff --git a/Source/Plugins/Plugin_PadSimple/Src/SConscript b/Source/Plugins/Plugin_PadSimple/Src/SConscript
index a35379f2c3..d00657d917 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/SConscript
+++ b/Source/Plugins/Plugin_PadSimple/Src/SConscript
@@ -10,9 +10,10 @@ else:
 
 files = [
 	"PadSimple.cpp",
+        "XInputBase.cpp",
+	"GUI/ConfigDlg.cpp",
 	]
-if not env['nowx']:
-	files += ["GUI/ConfigDlg.cpp", "XInputBase.cpp",]
+
 padenv = env.Clone()
-padenv.Append(LIBS = [ 'common', 'X11' ])
+padenv.Append(LIBS = [ 'common' ])
 padenv.SharedLibrary(output, files)
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Globals.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Globals.cpp
index e66ac0556f..e96ca12e4c 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Globals.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Globals.cpp
@@ -15,13 +15,12 @@
 // Official SVN repository and contact information can be found at

 // http://code.google.com/p/dolphin-emu/

 

-#ifdef USE_WX

+

 #include <wx/wx.h>

 #include <wx/filepicker.h>

 #include <wx/notebook.h>

 #include <wx/dialog.h>

 #include <wx/aboutdlg.h>

-#endif

 

 #include "Globals.h"

 

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
index 5107a3558b..073413206d 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
@@ -8,11 +8,13 @@ import utils
 
 files = [
 	'BPStructs.cpp',
+	'DataReader.cpp',
 	'Globals.cpp',
 	'GLInit.cpp',
 	'main.cpp',
 	'memcpy_amd.cpp',
 	'OpcodeDecoding.cpp',
+#	'OpcodeReaders.cpp', # outdated
 	'PixelShader.cpp',
 	'PixelShaderManager.cpp',
 	'rasterfont.cpp',
@@ -23,9 +25,8 @@ files = [
 	'VertexShader.cpp',
 	'VertexShaderManager.cpp',
 	'XFB.cpp',
+	'GUI/ConfigDlg.cpp',
 	]
-if not env['nowx']:
-	files += ['GUI/ConfigDlg.cpp',]
 compileFlags = [
 	'-fPIC',
 	]
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index 2d3a7d0728..923c19dd6f 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -15,10 +15,7 @@
 // Official SVN repository and contact information can be found at

 // http://code.google.com/p/dolphin-emu/

 

-#ifdef USE_WX

 #include <wx/aboutdlg.h>

-#endif

-

 #include "Globals.h"

 

 #ifdef _WIN32

@@ -29,9 +26,7 @@
 #include <SDL.h>

 #endif

 

-#ifdef USE_WX

 #include "GUI/ConfigDlg.h"

-#endif

 

 #include "Render.h"

 #include "GLInit.h"

@@ -67,17 +62,14 @@ void GetDllInfo (PLUGIN_INFO* _PluginInfo)
 

 void DllAbout(HWND _hParent) 

 {

-	#ifdef USE_WX

 	wxAboutDialogInfo info;

 	info.AddDeveloper(_T("zerofrog(@gmail.com)"));

 	info.SetDescription(_T("Vertex/Pixel Shader 2.0 or higher, framebuffer objects, multiple render targets"));

 	wxAboutBox(info);

-	#endif

 }

 

 void DllConfig(HWND _hParent)

 {

-#ifdef USE_WX

 #if defined(_WIN32)

 	wxWindow win;

 	win.SetHWND(_hParent);

@@ -157,7 +149,6 @@ void DllConfig(HWND _hParent)
 	//TODO

 

 #endif

-#endif

 }

 

 

diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote_Test.cpp b/Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote_Test.cpp
index 6a9f1f5aaf..b5eee4936e 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote_Test.cpp
+++ b/Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote_Test.cpp
@@ -1,6 +1,4 @@
-#ifdef USE_WX

 #include <wx/aboutdlg.h>

-#endif

 

 #include "Common.h"

 #include "StringUtil.h"

@@ -145,13 +143,11 @@ extern "C" void GetDllInfo (PLUGIN_INFO* _PluginInfo)
 

 extern "C" void DllAbout(HWND _hParent) 

 {

-	#ifdef USE_WX

 	wxAboutDialogInfo info;

 	info.SetName(_T("Wiimote test plugin"));

 	info.AddDeveloper(_T("masken (masken3@gmail.com)"));

 	info.SetDescription(_T("Wiimote test plugin"));

 	wxAboutBox(info);

-	#endif

 }

 

 extern "C" void DllConfig(HWND _hParent)

diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/SConscript b/Source/Plugins/Plugin_nJoy_SDL/Src/SConscript
index 661b0c9d89..8c04da16c4 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/SConscript
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/SConscript
@@ -10,9 +10,9 @@ else:
 
 files = [
 	'nJoy.cpp',
+	'GUI/AboutBox.cpp',
+	'GUI/ConfigBox.cpp',
 	]
-if not env['nowx']:
-	files += ['GUI/AboutBox.cpp', 'GUI/ConfigBox.cpp',]
 
 padenv = env.Clone()
 padenv.Append(
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
index 9091061d94..7ce5e741d9 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
@@ -80,7 +80,7 @@ HRESULT SetDeviceForcesXY();
 //////////////////////////////////////////////////////////////////////////////////////////

 // wxWidgets

 // ŻŻŻŻŻŻŻŻŻ

-#ifdef USE_WX

+#ifdef USE_WXWIDGETS

 class wxDLLApp : public wxApp

 {

 	bool OnInit()

@@ -146,14 +146,14 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
 	_PluginInfo->Version = 0x0100;

 	_PluginInfo->Type = PLUGIN_TYPE_PAD;

 

-#ifdef DEBUGFAST 
-	sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION" (DebugFast) by Falcon4ever");
-#else
-#ifndef _DEBUG
-	sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION " by Falcon4ever");
-#else
-	sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION" (Debug) by Falcon4ever");
-#endif
+#ifdef DEBUGFAST 

+	sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION" (DebugFast) by Falcon4ever");

+#else

+#ifndef _DEBUG

+	sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION " by Falcon4ever");

+#else

+	sprintf(_PluginInfo->Name, "nJoy v"INPUT_VERSION" (Debug) by Falcon4ever");

+#endif

 #endif

 }

 

@@ -161,7 +161,7 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
 // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ

 void DllAbout(HWND _hParent)

 {

-	#ifdef USE_WX

+	#ifdef USE_WXWIDGETS

 		#ifdef _WIN32

 		wxWindow win;

 		win.SetHWND((WXHWND)_hParent);

@@ -189,7 +189,7 @@ void DllAbout(HWND _hParent)
 void DllConfig(HWND _hParent)

 {

 

-	#ifdef USE_WX		

+	#ifdef USE_WXWIDGETS		

 		#ifdef _WIN32

 		if(SDL_Init(SDL_INIT_JOYSTICK ) < 0)

 		{

diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h
index f207873cd5..505d96eb84 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h
@@ -62,10 +62,9 @@
 #endif

 #ifdef __linux__

 #include <linux/input.h>

-#include <fcntl.h>

 #endif

 

-#ifdef USE_WX

+#ifdef USE_WXWIDGETS

 #include "GUI/AboutBox.h"

 #include "GUI/ConfigBox.h"

 #else