Fix the nowx build. Do we still want to keep the nowx build? If you do speak up now because soren wants to remove it.

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

Source/Core/DolphinWX/Src/MainNoGUI.cpp

@@ -379,7 +379,6 @@ int main(int argc, char* argv[])
 	updateMainFrameEvent.Init();
 
 	LogManager::Init();
-	EventHandler::Init();
 	SConfig::Init();
 	CPluginManager::Init();
 
@@ -402,7 +401,6 @@ int main(int argc, char* argv[])
 
 	CPluginManager::Shutdown();
 	SConfig::Shutdown();
-	EventHandler::Shutdown();
 	LogManager::Shutdown();
 
 	cmdline_parser_free (&args_info);

Source/Core/DolphinWX/Src/SConscript

@@ -12,7 +12,7 @@ files = [
 
 libs = [
 	'core', 'lzo2', 'discio', 'bdisasm', 'videocommon',
-	'inputuicommon', 'inputcommon', 'common', 'lua', 'z', 'sfml-network',
+	'inputcommon', 'common', 'lua', 'z', 'sfml-network',
 	'SDL'
 	]
 
@@ -51,7 +51,7 @@ if wxenv['HAVE_WX']:
 		'wxNEEDS_CHARPP',
 		],
 
-	libs = [ 'debwx', 'debugger_ui_util'] + libs
+	libs = [ 'debwx', 'debugger_ui_util', 'inputuicommon'] + libs
 else:
 	files+= [
 		'cmdline.c',

Source/Core/InputCommon/Src/UDPWrapper.cpp

@@ -84,6 +84,8 @@ UDPWrapper::~UDPWrapper()
 }
 
 
+#if defined(HAVE_WX) && HAVE_WX
+
 #define _connect_macro_(b, f, c, s)	(b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s)
 
 class UDPConfigDiag : public wxDialog
@@ -173,3 +175,4 @@ void UDPWrapper::Configure(wxWindow * parent)
 	diag->ShowModal();
 	diag->Destroy();
 }
+#endif

Source/Core/InputCommon/Src/UDPWrapper.h

@@ -6,6 +6,7 @@
 #include "IniFile.h"
 #include <string>
 
+#if defined(HAVE_WX) && HAVE_WX
 #include <wx/wx.h>
 #include <wx/listbox.h>
 #include <wx/textctrl.h>
@@ -16,6 +17,7 @@
 #include <wx/notebook.h>
 #include <wx/panel.h>
 #include <wx/spinctrl.h>
+#endif
 
 #include "UDPWiimote.h"
 
@@ -31,7 +33,9 @@ public:
 	virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );
 	virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );
 	void Refresh();
+#if defined(HAVE_WX) && HAVE_WX
 	void Configure(wxWindow * parent);
+#endif
 	virtual ~UDPWrapper();
 };
 

Source/Plugins/Plugin_Wiimote/Src/SConscript

@@ -20,7 +20,10 @@ files = [
 	"UDPWiimote.cpp"
 	]
 
+libs = [ 'inputcommon', 'common', 'SDL' ]
+
 if wmenv['HAVE_WX']:
+	libs = [ 'inputuicommon' ] + libs
 	files += [
 		"ConfigBasicDlg.cpp",
 		"ConfigPadDlg.cpp",
@@ -28,8 +31,6 @@ if wmenv['HAVE_WX']:
 		"FillReport.cpp",
         ]
 
-libs = [ 'inputuicommon', 'inputcommon', 'common', 'SDL' ]
-
 cxxflags = [ ]
 
 if wmenv['HAVE_WIIUSE']:

Source/Plugins/Plugin_WiimoteNew/Src/SConscript

@@ -17,17 +17,20 @@ files = [
 	'WiimoteEmu/EmuSubroutines.cpp',
 	'WiimoteEmu/Encryption.cpp',
 	'WiimoteEmu/Speaker.cpp',
-	  'WiimoteNew.cpp',
+	'WiimoteNew.cpp'
-	  'WiimoteConfigDiag.cpp',
 	]
 
-libs = [ 'inputuicommon', 'inputcommon', 'common', 'SDL' ]
+libs = [ 'inputcommon', 'common', 'SDL' ]
 
 cxxflags = [ ]
 
+if wiinewenv['HAVE_WX']:
+	libs = [ 'inputuicommon' ] + libs
+	files += [ 'WiimoteConfigDiag.cpp' ]
+
 if wiinewenv['HAVE_WIIUSE']:
 	cxxflags += [ '-DHAVE_WIIUSE' ]
-	files += [ "WiimoteReal/WiimoteReal.cpp" ]
+	files += [ 'WiimoteReal/WiimoteReal.cpp' ]
 	libs += [ 'wiiuse' ]
 
 wiinewenv.Append(

Source/Plugins/Plugin_WiimoteNew/Src/WiimoteNew.cpp

@@ -2,13 +2,13 @@
 #include "Common.h"
 #include "pluginspecs_wiimote.h"
 
-#include "WiimoteConfigDiag.h"
 #include "WiimoteReal/WiimoteReal.h"
 
 #include "ControllerInterface/ControllerInterface.h"
 #include "WiimoteEmu/WiimoteEmu.h"
 
 #if defined(HAVE_WX) && HAVE_WX
+#include "WiimoteConfigDiag.h"
 #include "../../InputUICommon/Src/ConfigDiag.h"
 #endif
 #include "../../InputCommon/Src/InputConfig.h"