diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj index 42312e3557..f5384ad86e 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcproj +++ b/Source/Core/DolphinWX/DolphinWX.vcproj @@ -1,7 +1,7 @@ - - @@ -524,14 +520,6 @@ RelativePath=".\Src\SDL_Util.h" > - - - - diff --git a/Source/Core/InputCommon/Src/InputCommon.cpp b/Source/Core/InputCommon/Src/InputCommon.cpp deleted file mode 100644 index beed506f8e..0000000000 --- a/Source/Core/InputCommon/Src/InputCommon.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "EventHandler.h" - -//EventHandler *eventHandler = NULL; - -namespace InputCommon -{ - void Init() { - // init the event handler - //EventHandler::GetInstance(); - } - - void Shutdown() { - //if (eventHandler) - // delete eventHandler; - } -} diff --git a/Source/Core/InputCommon/Src/InputCommon.h b/Source/Core/InputCommon/Src/InputCommon.h index 3419902c47..52b75e0f0f 100644 --- a/Source/Core/InputCommon/Src/InputCommon.h +++ b/Source/Core/InputCommon/Src/InputCommon.h @@ -20,6 +20,4 @@ enum EXInputTrigger XI_TRIGGER_R, }; - void Init(); - void Shutdown(); } diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript index 861c34851b..750045d285 100644 --- a/Source/Core/InputCommon/Src/SConscript +++ b/Source/Core/InputCommon/Src/SConscript @@ -5,7 +5,6 @@ Import('env') files = [ 'Configuration.cpp', 'ControllerEmu.cpp', - 'InputCommon.cpp', 'InputConfig.cpp', 'SDL_Util.cpp', 'ControllerInterface/ControllerInterface.cpp', @@ -17,11 +16,6 @@ if env['HAVE_X11']: "X11InputBase.cpp", ] -if env['HAVE_WX']: - files += [ - "WXInputBase.cpp", - ] - if sys.platform == 'darwin': files += [ 'ControllerInterface/OSX/OSX.mm', diff --git a/Source/Core/InputUICommon/InputUICommon.vcproj b/Source/Core/InputUICommon/InputUICommon.vcproj index 6e4b6c9a97..8ec25a57a1 100644 --- a/Source/Core/InputUICommon/InputUICommon.vcproj +++ b/Source/Core/InputUICommon/InputUICommon.vcproj @@ -419,6 +419,14 @@ RelativePath=".\Src\SConscript" > + + + + diff --git a/Source/Core/InputUICommon/Src/SConscript b/Source/Core/InputUICommon/Src/SConscript index 18d98eed59..a0c6ec8013 100644 --- a/Source/Core/InputUICommon/Src/SConscript +++ b/Source/Core/InputUICommon/Src/SConscript @@ -9,6 +9,7 @@ if not env['HAVE_WX']: files = [ 'ConfigDiag.cpp', 'ConfigDiagBitmaps.cpp', + 'WXInputBase.cpp', ] env.StaticLibrary(env['local_libs'] + 'debugger_ui_util', files) diff --git a/Source/Core/InputCommon/Src/WXInputBase.cpp b/Source/Core/InputUICommon/Src/WXInputBase.cpp similarity index 100% rename from Source/Core/InputCommon/Src/WXInputBase.cpp rename to Source/Core/InputUICommon/Src/WXInputBase.cpp diff --git a/Source/Core/InputCommon/Src/WXInputBase.h b/Source/Core/InputUICommon/Src/WXInputBase.h similarity index 100% rename from Source/Core/InputCommon/Src/WXInputBase.h rename to Source/Core/InputUICommon/Src/WXInputBase.h diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln index 646accede0..418364859d 100644 --- a/Source/Dolphin.sln +++ b/Source/Dolphin.sln @@ -59,6 +59,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\D {823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {823DDC98-42D5-4A38-88CF-9DC06C788AE4} {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4} = {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} + {374E2DB7-42DF-4E59-8474-62B6687F4978} = {374E2DB7-42DF-4E59-8474-62B6687F4978} {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} = {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} {4D3CD4C5-412B-4B49-9B1B-A68A2A129C77} = {4D3CD4C5-412B-4B49-9B1B-A68A2A129C77} @@ -98,6 +99,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_Wiimote", "Plugins\P {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} + {374E2DB7-42DF-4E59-8474-62B6687F4978} = {374E2DB7-42DF-4E59-8474-62B6687F4978} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} EndProjectSection diff --git a/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj b/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj index d1c02c8ab8..233b97b639 100644 --- a/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj +++ b/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj @@ -1,7 +1,7 @@