From a34ad4051719830bdac91c0447f58ef0be4dca0d Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Thu, 3 Jun 2010 05:59:58 +0000
Subject: An almost linux/osx compile fix beside some undefined references

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5581 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/InputCommon/Src/Config.cpp     |  2 +-
 Source/Core/InputCommon/Src/Config.h       | 33 ------------------------------
 Source/Core/InputCommon/Src/ConfigInput.h  | 33 ++++++++++++++++++++++++++++++
 Source/Core/InputCommon/Src/SConscript     |  9 ++------
 Source/Core/InputCommon/Src/X11InputBase.h |  2 +-
 5 files changed, 37 insertions(+), 42 deletions(-)
 delete mode 100644 Source/Core/InputCommon/Src/Config.h
 create mode 100644 Source/Core/InputCommon/Src/ConfigInput.h

(limited to 'Source/Core/InputCommon')

diff --git a/Source/Core/InputCommon/Src/Config.cpp b/Source/Core/InputCommon/Src/Config.cpp
index 134d2687e0..2b1b330e12 100644
--- a/Source/Core/InputCommon/Src/Config.cpp
+++ b/Source/Core/InputCommon/Src/Config.cpp
@@ -1,5 +1,5 @@
 
-#include "Config.h"
+#include "ConfigInput.h"
 
 Plugin::Plugin( const char* const _ini_name, const char* const _gui_name, const char* const _profile_name  )
 	: ini_name(_ini_name)
diff --git a/Source/Core/InputCommon/Src/Config.h b/Source/Core/InputCommon/Src/Config.h
deleted file mode 100644
index 51379a33fc..0000000000
--- a/Source/Core/InputCommon/Src/Config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include "ControllerInterface/ControllerInterface.h"
-#include "Thread.h"
-#include "FileUtil.h"
-#include "IniFile.h"
-
-#include "ControllerEmu.h"
-
-#include <string>
-#include <vector>
-#include <map>
-#include <sstream>
-
-class Plugin
-{
-public:
-
-	Plugin( const char* const _ini_name, const char* const _gui_name, const char* const _profile_name  );
-	~Plugin();
-
-	void LoadConfig();
-	void SaveConfig();
-
-	std::vector< ControllerEmu* >	controllers;
-
-	Common::CriticalSection			controls_crit, interface_crit;		// lock controls first
-	ControllerInterface				controller_interface;
-
-	const char * const		ini_name;
-	const char * const		gui_name;
-	const char * const		profile_name;
-};
diff --git a/Source/Core/InputCommon/Src/ConfigInput.h b/Source/Core/InputCommon/Src/ConfigInput.h
new file mode 100644
index 0000000000..51379a33fc
--- /dev/null
+++ b/Source/Core/InputCommon/Src/ConfigInput.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "ControllerInterface/ControllerInterface.h"
+#include "Thread.h"
+#include "FileUtil.h"
+#include "IniFile.h"
+
+#include "ControllerEmu.h"
+
+#include <string>
+#include <vector>
+#include <map>
+#include <sstream>
+
+class Plugin
+{
+public:
+
+	Plugin( const char* const _ini_name, const char* const _gui_name, const char* const _profile_name  );
+	~Plugin();
+
+	void LoadConfig();
+	void SaveConfig();
+
+	std::vector< ControllerEmu* >	controllers;
+
+	Common::CriticalSection			controls_crit, interface_crit;		// lock controls first
+	ControllerInterface				controller_interface;
+
+	const char * const		ini_name;
+	const char * const		gui_name;
+	const char * const		profile_name;
+};
diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript
index d80a43f3c3..d116c0f49c 100644
--- a/Source/Core/InputCommon/Src/SConscript
+++ b/Source/Core/InputCommon/Src/SConscript
@@ -5,8 +5,8 @@ icenv = env.Clone()
 
 files = [
 	'Configuration.cpp',
-	'EventHandler.cpp',
-	'InputCommon.cpp',
+	'Config.cpp',
+	'ControllerEmu.cpp',
 	'SDL_Util.cpp',
 	'ControllerInterface/ControllerInterface.cpp',
 	]
@@ -16,11 +16,6 @@ if env['HAVE_X11']:
 		"X11InputBase.cpp",
 		]
 
-if env['HAVE_WX']:
-	files += [
-		"WXInputBase.cpp",
-		]
-
 if icenv['HAVE_SDL']:
 	files += [
 		'ControllerInterface/SDL/SDL.cpp'
diff --git a/Source/Core/InputCommon/Src/X11InputBase.h b/Source/Core/InputCommon/Src/X11InputBase.h
index 13c6717f86..0d9e85458d 100644
--- a/Source/Core/InputCommon/Src/X11InputBase.h
+++ b/Source/Core/InputCommon/Src/X11InputBase.h
@@ -20,7 +20,7 @@
 
 #include <X11/X.h>
 #include <X11/keysym.h>
-#include "Config.h"
+#include "ConfigInput.h"
 #if defined(HAVE_WX) && HAVE_WX
 #include <wx/wx.h>
 #endif
-- 
cgit v1.2.3