From 1cd25e2406ea370cacfb82ec6dc164153052ca9d Mon Sep 17 00:00:00 2001 From: hrydgard Date: Sat, 12 Jun 2010 17:39:33 +0000 Subject: [PATCH] (cleanup) InputPluginCommon is dead. Long live InputCommon and InputUICommon. I hope I didn't break the mac+linux builds - if i did, fixing it should be a simple matter of adjusting the sconscripts. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5661 8ced0084-cf51-0410-be5f-012b33b47a6e --- SConstruct | 4 +- Source/Core/InputCommon/InputCommon.vcproj | 18 +- .../InputCommon}/Src/ControllerEmu.cpp | 0 .../InputCommon}/Src/ControllerEmu.h | 3 +- .../InputCommon/Src/InputConfig.cpp} | 3 +- .../InputCommon/Src/InputConfig.h} | 2 +- Source/Core/InputCommon/Src/SConscript | 2 + .../InputUICommon/InputUICommon.vcproj} | 867 +++++++++--------- .../InputUICommon}/Src/ConfigDiag.cpp | 0 .../InputUICommon}/Src/ConfigDiag.h | 7 +- .../InputUICommon}/Src/ConfigDiagBitmaps.cpp | 1 - Source/Core/InputUICommon/Src/SConscript | 14 + Source/Dolphin.sln | 38 +- .../Plugins/InputPluginCommon/Src/SConscript | 19 - .../Plugin_WiimoteNew/Src/WiimoteNew.cpp | 4 +- 15 files changed, 484 insertions(+), 498 deletions(-) rename Source/{Plugins/InputPluginCommon => Core/InputCommon}/Src/ControllerEmu.cpp (100%) rename Source/{Plugins/InputPluginCommon => Core/InputCommon}/Src/ControllerEmu.h (99%) rename Source/{Plugins/InputPluginCommon/Src/Config.cpp => Core/InputCommon/Src/InputConfig.cpp} (98%) rename Source/{Plugins/InputPluginCommon/Src/Config.h => Core/InputCommon/Src/InputConfig.h} (96%) rename Source/{Plugins/InputPluginCommon/InputPluginCommon.vcproj => Core/InputUICommon/InputUICommon.vcproj} (69%) rename Source/{Plugins/InputPluginCommon => Core/InputUICommon}/Src/ConfigDiag.cpp (100%) rename Source/{Plugins/InputPluginCommon => Core/InputUICommon}/Src/ConfigDiag.h (97%) rename Source/{Plugins/InputPluginCommon => Core/InputUICommon}/Src/ConfigDiagBitmaps.cpp (99%) create mode 100644 Source/Core/InputUICommon/Src/SConscript delete mode 100644 Source/Plugins/InputPluginCommon/Src/SConscript diff --git a/SConstruct b/SConstruct index d9e758d577..d169a47983 100644 --- a/SConstruct +++ b/SConstruct @@ -47,7 +47,7 @@ include_paths = [ basedir + 'Externals/WiiUseSrc/Src', basedir + 'Source/Core/VideoCommon/Src', basedir + 'Source/Core/InputCommon/Src', - basedir + 'Source/Plugins/InputPluginCommon/Src', + basedir + 'Source/Plugins/InputUICommon/Src', basedir + 'Source/Core/AudioCommon/Src', basedir + 'Source/Core/DebuggerUICommon/Src', basedir + 'Source/Core/DSPCore/Src', @@ -66,7 +66,7 @@ dirs = [ 'Source/Core/DebuggerUICommon/Src', 'Source/Core/DSPCore/Src', 'Source/DSPTool/Src', - 'Source/Plugins/InputPluginCommon/Src/', + 'Source/Plugins/InputUICommon/Src/', 'Source/Plugins/Plugin_VideoOGL/Src', 'Source/Plugins/Plugin_VideoSoftware/Src', 'Source/Plugins/Plugin_DSP_HLE/Src', diff --git a/Source/Core/InputCommon/InputCommon.vcproj b/Source/Core/InputCommon/InputCommon.vcproj index c6a11789e0..92849a1c27 100644 --- a/Source/Core/InputCommon/InputCommon.vcproj +++ b/Source/Core/InputCommon/InputCommon.vcproj @@ -1,7 +1,7 @@ + + + + @@ -508,6 +516,14 @@ RelativePath=".\Src\InputCommon.h" > + + + + diff --git a/Source/Plugins/InputPluginCommon/Src/ControllerEmu.cpp b/Source/Core/InputCommon/Src/ControllerEmu.cpp similarity index 100% rename from Source/Plugins/InputPluginCommon/Src/ControllerEmu.cpp rename to Source/Core/InputCommon/Src/ControllerEmu.cpp diff --git a/Source/Plugins/InputPluginCommon/Src/ControllerEmu.h b/Source/Core/InputCommon/Src/ControllerEmu.h similarity index 99% rename from Source/Plugins/InputPluginCommon/Src/ControllerEmu.h rename to Source/Core/InputCommon/Src/ControllerEmu.h index 2e53c1473b..90170c21cd 100644 --- a/Source/Plugins/InputPluginCommon/Src/ControllerEmu.h +++ b/Source/Core/InputCommon/Src/ControllerEmu.h @@ -23,10 +23,9 @@ #include "pluginspecs_pad.h" #include "pluginspecs_wiimote.h" -//#include #include -#include +#include "ControllerInterface/ControllerInterface.h" #include "IniFile.h" #include diff --git a/Source/Plugins/InputPluginCommon/Src/Config.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp similarity index 98% rename from Source/Plugins/InputPluginCommon/Src/Config.cpp rename to Source/Core/InputCommon/Src/InputConfig.cpp index 85f10bfb3e..410aecb928 100644 --- a/Source/Plugins/InputPluginCommon/Src/Config.cpp +++ b/Source/Core/InputCommon/Src/InputConfig.cpp @@ -15,8 +15,7 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "Config.h" - +#include "InputConfig.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/Plugins/InputPluginCommon/Src/Config.h b/Source/Core/InputCommon/Src/InputConfig.h similarity index 96% rename from Source/Plugins/InputPluginCommon/Src/Config.h rename to Source/Core/InputCommon/Src/InputConfig.h index 866fe58a87..6e8d8adef0 100644 --- a/Source/Plugins/InputPluginCommon/Src/Config.h +++ b/Source/Core/InputCommon/Src/InputConfig.h @@ -18,11 +18,11 @@ #ifndef _CONFIG_H_ #define _CONFIG_H_ -#include #include "Thread.h" #include "FileUtil.h" #include "IniFile.h" +#include "ControllerInterface/ControllerInterface.h" #include "ControllerEmu.h" #include diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript index 426d877aac..fad361aadf 100644 --- a/Source/Core/InputCommon/Src/SConscript +++ b/Source/Core/InputCommon/Src/SConscript @@ -4,8 +4,10 @@ Import('env') files = [ 'Configuration.cpp', + 'ControllerEmu.cpp', 'EventHandler.cpp', 'InputCommon.cpp', + 'InputConfig.cpp', 'SDL_Util.cpp', 'ControllerInterface/ControllerInterface.cpp', 'ControllerInterface/SDL/SDL.cpp' diff --git a/Source/Plugins/InputPluginCommon/InputPluginCommon.vcproj b/Source/Core/InputUICommon/InputUICommon.vcproj similarity index 69% rename from Source/Plugins/InputPluginCommon/InputPluginCommon.vcproj rename to Source/Core/InputUICommon/InputUICommon.vcproj index 11642d9962..6e4b6c9a97 100644 --- a/Source/Plugins/InputPluginCommon/InputPluginCommon.vcproj +++ b/Source/Core/InputUICommon/InputUICommon.vcproj @@ -1,442 +1,425 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Plugins/InputPluginCommon/Src/ConfigDiag.cpp b/Source/Core/InputUICommon/Src/ConfigDiag.cpp similarity index 100% rename from Source/Plugins/InputPluginCommon/Src/ConfigDiag.cpp rename to Source/Core/InputUICommon/Src/ConfigDiag.cpp diff --git a/Source/Plugins/InputPluginCommon/Src/ConfigDiag.h b/Source/Core/InputUICommon/Src/ConfigDiag.h similarity index 97% rename from Source/Plugins/InputPluginCommon/Src/ConfigDiag.h rename to Source/Core/InputUICommon/Src/ConfigDiag.h index 8d9b39bb55..98e8e89340 100644 --- a/Source/Plugins/InputPluginCommon/Src/ConfigDiag.h +++ b/Source/Core/InputUICommon/Src/ConfigDiag.h @@ -39,8 +39,9 @@ #include #include -#include -#include "Config.h" +#include "ControllerInterface/ControllerInterface.h" +#include "ControllerEmu.h" +#include "InputConfig.h" #include "FileSearch.h" class PadSetting @@ -74,7 +75,7 @@ public: void UpdateGUI(); void UpdateValue(); - ControlState& value; + ControlState& value; }; class PadSettingCheckBox : public wxCheckBox, public PadSetting diff --git a/Source/Plugins/InputPluginCommon/Src/ConfigDiagBitmaps.cpp b/Source/Core/InputUICommon/Src/ConfigDiagBitmaps.cpp similarity index 99% rename from Source/Plugins/InputPluginCommon/Src/ConfigDiagBitmaps.cpp rename to Source/Core/InputUICommon/Src/ConfigDiagBitmaps.cpp index 17e7936009..4a31c112b9 100644 --- a/Source/Plugins/InputPluginCommon/Src/ConfigDiagBitmaps.cpp +++ b/Source/Core/InputUICommon/Src/ConfigDiagBitmaps.cpp @@ -19,7 +19,6 @@ void ConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event)) { - GamepadPage* const current_page = (GamepadPage*)m_pad_notebook->GetPage( m_pad_notebook->GetSelection() ); std::vector< ControlGroupBox* >::iterator g = current_page->control_groups.begin(), diff --git a/Source/Core/InputUICommon/Src/SConscript b/Source/Core/InputUICommon/Src/SConscript new file mode 100644 index 0000000000..18d98eed59 --- /dev/null +++ b/Source/Core/InputUICommon/Src/SConscript @@ -0,0 +1,14 @@ +# -*- python -*- + +Import('env') +import sys + +if not env['HAVE_WX']: + Return() + +files = [ + 'ConfigDiag.cpp', + 'ConfigDiagBitmaps.cpp', + ] + +env.StaticLibrary(env['local_libs'] + 'debugger_ui_util', files) diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln index e654ad6041..646accede0 100644 --- a/Source/Dolphin.sln +++ b/Source/Dolphin.sln @@ -189,8 +189,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_GCPadNew", "Plugins\ {05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75} {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} - {660BB3F7-ED8F-4027-A460-8E4EDA8189BE} = {660BB3F7-ED8F-4027-A460-8E4EDA8189BE} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} EndProjectSection EndProject @@ -200,20 +200,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_WiimoteNew", "Plugin {05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75} {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} - {660BB3F7-ED8F-4027-A460-8E4EDA8189BE} = {660BB3F7-ED8F-4027-A460-8E4EDA8189BE} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputPluginCommon", "Plugins\InputPluginCommon\InputPluginCommon.vcproj", "{660BB3F7-ED8F-4027-A460-8E4EDA8189BE}" - ProjectSection(ProjectDependencies) = postProject - {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} - {05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75} - {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} - {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputUICommon", "Core\InputUICommon\InputUICommon.vcproj", "{374E2DB7-42DF-4E59-8474-62B6687F4978}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -587,18 +579,18 @@ Global {BB6CE47B-C676-44BB-AE93-2CF59B8C8BD4}.Release|Win32.Build.0 = Release|Win32 {BB6CE47B-C676-44BB-AE93-2CF59B8C8BD4}.Release|x64.ActiveCfg = Release|x64 {BB6CE47B-C676-44BB-AE93-2CF59B8C8BD4}.Release|x64.Build.0 = Release|x64 - {660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Debug|Win32.ActiveCfg = Debug|Win32 - {660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Debug|Win32.Build.0 = Debug|Win32 - {660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Debug|x64.ActiveCfg = Debug|x64 - {660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Debug|x64.Build.0 = Debug|x64 - {660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 - {660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.DebugFast|Win32.Build.0 = DebugFast|Win32 - {660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.DebugFast|x64.ActiveCfg = DebugFast|x64 - {660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.DebugFast|x64.Build.0 = DebugFast|x64 - {660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Release|Win32.ActiveCfg = Release|Win32 - {660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Release|Win32.Build.0 = Release|Win32 - {660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Release|x64.ActiveCfg = Release|x64 - {660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Release|x64.Build.0 = Release|x64 + {374E2DB7-42DF-4E59-8474-62B6687F4978}.Debug|Win32.ActiveCfg = Debug|Win32 + {374E2DB7-42DF-4E59-8474-62B6687F4978}.Debug|Win32.Build.0 = Debug|Win32 + {374E2DB7-42DF-4E59-8474-62B6687F4978}.Debug|x64.ActiveCfg = Debug|x64 + {374E2DB7-42DF-4E59-8474-62B6687F4978}.Debug|x64.Build.0 = Debug|x64 + {374E2DB7-42DF-4E59-8474-62B6687F4978}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 + {374E2DB7-42DF-4E59-8474-62B6687F4978}.DebugFast|Win32.Build.0 = DebugFast|Win32 + {374E2DB7-42DF-4E59-8474-62B6687F4978}.DebugFast|x64.ActiveCfg = DebugFast|x64 + {374E2DB7-42DF-4E59-8474-62B6687F4978}.DebugFast|x64.Build.0 = DebugFast|x64 + {374E2DB7-42DF-4E59-8474-62B6687F4978}.Release|Win32.ActiveCfg = Release|Win32 + {374E2DB7-42DF-4E59-8474-62B6687F4978}.Release|Win32.Build.0 = Release|Win32 + {374E2DB7-42DF-4E59-8474-62B6687F4978}.Release|x64.ActiveCfg = Release|x64 + {374E2DB7-42DF-4E59-8474-62B6687F4978}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/Plugins/InputPluginCommon/Src/SConscript b/Source/Plugins/InputPluginCommon/Src/SConscript deleted file mode 100644 index 69d010169f..0000000000 --- a/Source/Plugins/InputPluginCommon/Src/SConscript +++ /dev/null @@ -1,19 +0,0 @@ -# -*- python -*- - -Import('env') - -files = [ - 'Config.cpp', - 'ControllerEmu.cpp', - ] - -if env['HAVE_WX']: - files += [ - 'ConfigDiagBitmaps.cpp', - 'ConfigDiag.cpp', - ] - - - -env_inputpc = env.Clone() -env_inputpc.StaticLibrary(env['local_libs'] + "inputplugincommon", files) diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteNew.cpp b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteNew.cpp index 02f2b51610..94093e2bc5 100644 --- a/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteNew.cpp +++ b/Source/Plugins/Plugin_WiimoteNew/Src/WiimoteNew.cpp @@ -6,9 +6,9 @@ #include "WiimoteEmu/WiimoteEmu.h" #if defined(HAVE_WX) && HAVE_WX -#include "ConfigDiag.h" +#include "../../InputUICommon/Src/ConfigDiag.h" #endif -#include "../../InputPluginCommon/Src/Config.h" +#include "../../InputCommon/Src/InputConfig.h" #if defined(HAVE_X11) && HAVE_X11 #include