diff options
| author | nakeee <nakeee@gmail.com> | 2010-06-03 05:59:58 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2010-06-03 05:59:58 +0000 |
| commit | a34ad4051719830bdac91c0447f58ef0be4dca0d (patch) | |
| tree | 914943c04c29bad94254529d5779b4cd56a4c8e5 /Source/Core/InputCommon | |
| parent | edabeffaafeaef1418fc80c4fb97bb9188a67a15 (diff) | |
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
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/Src/Config.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/ConfigInput.h (renamed from Source/Core/InputCommon/Src/Config.h) | 0 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/SConscript | 9 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/X11InputBase.h | 2 |
4 files changed, 4 insertions, 9 deletions
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/ConfigInput.h index 51379a33fc..51379a33fc 100644 --- a/Source/Core/InputCommon/Src/Config.h +++ b/Source/Core/InputCommon/Src/ConfigInput.h 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 |