summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2021-01-28 01:33:46 +0100
committerGitHub <noreply@github.com>2021-01-28 01:33:46 +0100
commit9ca24ae8e0da53d09e402d18055f102440af7098 (patch)
treec1afad8f3611bf1cd49383100f21a635462269c1 /Source/Core/InputCommon
parent4740c2a882fc13fe93adae74139caadc0917c100 (diff)
parent500a694ca870f9f5a8ea196f4099a0e7de09fe50 (diff)
Merge pull request #9092 from shuffle2/vshack
msbuild: Merge "Core" libs into single DolphinLib
Diffstat (limited to 'Source/Core/InputCommon')
-rw-r--r--Source/Core/InputCommon/CMakeLists.txt8
-rw-r--r--Source/Core/InputCommon/ControlReference/ControlReference.h2
-rw-r--r--Source/Core/InputCommon/ControlReference/ExpressionParser.h2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.h2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControllerEmu.h2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp (renamed from Source/Core/InputCommon/ControllerInterface/Device.cpp)2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/CoreDevice.h (renamed from Source/Core/InputCommon/ControllerInterface/Device.h)0
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/SDL/SDL.h2
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp (renamed from Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.cpp)6
-rw-r--r--Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h (renamed from Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.h)6
-rw-r--r--Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp2
-rw-r--r--Source/Core/InputCommon/ImageOperations.cpp2
-rw-r--r--Source/Core/InputCommon/InputCommon.vcxproj116
-rw-r--r--Source/Core/InputCommon/InputCommon.vcxproj.filters261
27 files changed, 31 insertions, 408 deletions
diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt
index e0b8664a06..eb6c079f6b 100644
--- a/Source/Core/InputCommon/CMakeLists.txt
+++ b/Source/Core/InputCommon/CMakeLists.txt
@@ -54,10 +54,10 @@ add_library(inputcommon
ControllerInterface/DualShockUDPClient/DualShockUDPProto.h
ControllerInterface/ControllerInterface.cpp
ControllerInterface/ControllerInterface.h
- ControllerInterface/Device.cpp
- ControllerInterface/Device.h
- ControllerInterface/Wiimote/Wiimote.cpp
- ControllerInterface/Wiimote/Wiimote.h
+ ControllerInterface/CoreDevice.cpp
+ ControllerInterface/CoreDevice.h
+ ControllerInterface/Wiimote/WiimoteController.cpp
+ ControllerInterface/Wiimote/WiimoteController.h
ControlReference/ControlReference.cpp
ControlReference/ControlReference.h
ControlReference/ExpressionParser.cpp
diff --git a/Source/Core/InputCommon/ControlReference/ControlReference.h b/Source/Core/InputCommon/ControlReference/ControlReference.h
index fb4b5cc1df..59a21e8b7d 100644
--- a/Source/Core/InputCommon/ControlReference/ControlReference.h
+++ b/Source/Core/InputCommon/ControlReference/ControlReference.h
@@ -8,7 +8,7 @@
#include <memory>
#include "InputCommon/ControlReference/ExpressionParser.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
// ControlReference
//
diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.h b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
index a879528d4b..9789e9afe0 100644
--- a/Source/Core/InputCommon/ControlReference/ExpressionParser.h
+++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
@@ -9,7 +9,7 @@
#include <optional>
#include <string>
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
namespace ciface::ExpressionParser
{
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h
index d13fd60a68..ac0266f7c1 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.h
@@ -6,7 +6,7 @@
#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
#include "InputCommon/ControllerEmu/StickGate.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
namespace ControllerEmu
{
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h
index a5a6a95cd0..562313bb45 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h
@@ -8,7 +8,7 @@
#include <string>
#include "InputCommon/ControllerEmu/StickGate.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
namespace ControllerEmu
{
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h
index 95a7d89dad..a997654c0c 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.h
@@ -8,7 +8,7 @@
#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
namespace ControllerEmu
{
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h
index ade18b9f3b..dfd57c1a9a 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h
@@ -7,7 +7,7 @@
#include <string>
#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
namespace ControllerEmu
{
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h
index b3df548ede..de969f59b5 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.h
@@ -8,7 +8,7 @@
#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
namespace ControllerEmu
{
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h
index 929a0e2fb7..dc4c2364de 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.h
@@ -8,7 +8,7 @@
#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
#include "InputCommon/ControllerEmu/StickGate.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
namespace ControllerEmu
{
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.h
index 107b94c6f8..8b72d6738b 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.h
@@ -9,7 +9,7 @@
#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
namespace ControllerEmu
{
diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
index eaca692ced..00f750088a 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h
@@ -16,7 +16,7 @@
#include "Common/IniFile.h"
#include "Common/MathUtil.h"
#include "InputCommon/ControlReference/ExpressionParser.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
#include "InputCommon/DynamicInputTextureManager.h"
class ControllerInterface;
diff --git a/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h b/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h
index f049ddc565..443f34d2ec 100644
--- a/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h
+++ b/Source/Core/InputCommon/ControllerEmu/Setting/NumericSetting.h
@@ -10,7 +10,7 @@
#include "Common/CommonTypes.h"
#include "Common/IniFile.h"
#include "InputCommon/ControlReference/ControlReference.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
namespace ControllerEmu
{
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
index 84209a720b..ffa189437f 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
@@ -12,7 +12,7 @@
#include "Common/Matrix.h"
#include "Common/WindowSystemInfo.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
// enable disable sources
#ifdef _WIN32
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp
index 2fd7fb02e7..3a396ddf37 100644
--- a/Source/Core/InputCommon/ControllerInterface/Device.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp
@@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
#include <algorithm>
#include <cmath>
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/CoreDevice.h
index 2612f59627..2612f59627 100644
--- a/Source/Core/InputCommon/ControllerInterface/Device.h
+++ b/Source/Core/InputCommon/ControllerInterface/CoreDevice.h
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
index 70e8af8e6e..fe0f46424f 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
@@ -4,7 +4,7 @@
#pragma once
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
#include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h"
namespace ciface::DInput
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
index 0ae81fb6be..c3834df528 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
@@ -7,8 +7,8 @@
#include <windows.h>
#include "Common/Matrix.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
#include "InputCommon/ControllerInterface/DInput/DInput8.h"
-#include "InputCommon/ControllerInterface/Device.h"
namespace ciface::DInput
{
diff --git a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
index c689cef5a5..8fab93c429 100644
--- a/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
+++ b/Source/Core/InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h
@@ -10,7 +10,7 @@
#include "Common/Event.h"
#include "Common/Flag.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
#ifdef _WIN32
#include <Windows.h>
diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
index 377f7d9b29..89552a80de 100644
--- a/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
+++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.h
@@ -8,7 +8,7 @@
#include <IOKit/hid/IOHIDLib.h>
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
#include "InputCommon/ControllerInterface/ForceFeedback/ForceFeedbackDevice.h"
namespace ciface::OSX
diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h
index 39516035a3..740954082b 100644
--- a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h
+++ b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.h
@@ -7,7 +7,7 @@
#include <QuartzCore/QuartzCore.h>
#include "Common/Matrix.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
namespace ciface::Quartz
{
diff --git a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
index e9ac021bd9..38b6bf3cfb 100644
--- a/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
+++ b/Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
@@ -14,7 +14,7 @@
#include <SDL_haptic.h>
#endif
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
namespace ciface::SDL
{
diff --git a/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.cpp b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp
index 2a11904550..eaa56ef449 100644
--- a/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp
@@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
-#include "InputCommon/ControllerInterface/Wiimote/Wiimote.h"
+#include "InputCommon/ControllerInterface/Wiimote/WiimoteController.h"
#include "Common/BitUtils.h"
#include "Common/Logging/Log.h"
@@ -13,7 +13,7 @@
#include "InputCommon/ControllerEmu/ControllerEmu.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
-namespace ciface::Wiimote
+namespace ciface::WiimoteController
{
static constexpr char SOURCE_NAME[] = "Bluetooth";
@@ -1677,4 +1677,4 @@ void Device::ProcessStatusReport(const InputReportStatus& status)
}
}
-} // namespace ciface::Wiimote
+} // namespace ciface::WiimoteController
diff --git a/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.h b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h
index 0dc9082af6..4864e0abb3 100644
--- a/Source/Core/InputCommon/ControllerInterface/Wiimote/Wiimote.h
+++ b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.h
@@ -16,9 +16,9 @@
#include "Core/HW/WiimoteEmu/Extension/Nunchuk.h"
#include "Core/HW/WiimoteEmu/MotionPlus.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h"
-#include "InputCommon/ControllerInterface/Device.h"
+#include "InputCommon/ControllerInterface/CoreDevice.h"
-namespace ciface::Wiimote
+namespace ciface::WiimoteController
{
using namespace WiimoteCommon;
@@ -279,4 +279,4 @@ private:
Clock::time_point m_last_report_time = Clock::now();
};
-} // namespace ciface::Wiimote
+} // namespace ciface::WiimoteController
diff --git a/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp b/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp
index a2f1ca879c..171b74f3d2 100644
--- a/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp
+++ b/Source/Core/InputCommon/DynamicInputTextureConfiguration.cpp
@@ -12,8 +12,8 @@
#include <picojson.h>
#include "Common/CommonPaths.h"
-#include "Common/File.h"
#include "Common/FileUtil.h"
+#include "Common/IOFile.h"
#include "Common/Logging/Log.h"
#include "Common/StringUtil.h"
#include "Core/ConfigManager.h"
diff --git a/Source/Core/InputCommon/ImageOperations.cpp b/Source/Core/InputCommon/ImageOperations.cpp
index b659a9358b..7ce3b2d389 100644
--- a/Source/Core/InputCommon/ImageOperations.cpp
+++ b/Source/Core/InputCommon/ImageOperations.cpp
@@ -11,8 +11,8 @@
#include <string>
#include <vector>
-#include "Common/File.h"
#include "Common/FileUtil.h"
+#include "Common/IOFile.h"
#include "Common/Image.h"
namespace InputCommon
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj
deleted file mode 100644
index 8cd9f05963..0000000000
--- a/Source/Core/InputCommon/InputCommon.vcxproj
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\..\VSProps\Base.Macros.props" />
- <Import Project="$(VSPropsDir)Base.Targets.props" />
- <PropertyGroup Label="Globals">
- <ProjectGuid>{6BBD47CF-91FD-4077-B676-8B76980178A9}</ProjectGuid>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings" />
- <ImportGroup Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="$(VSPropsDir)Base.props" />
- <Import Project="$(VSPropsDir)PCHUse.props" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <ItemGroup>
- <ClCompile Include="ControllerEmu\ControlGroup\IMUAccelerometer.cpp" />
- <ClCompile Include="ControllerEmu\ControlGroup\IMUCursor.cpp" />
- <ClCompile Include="ControllerEmu\ControlGroup\IMUGyroscope.cpp" />
- <ClCompile Include="ControllerEmu\ControllerEmu.cpp" />
- <ClCompile Include="ControllerEmu\StickGate.cpp" />
- <ClCompile Include="ControllerEmu\Control\Control.cpp" />
- <ClCompile Include="ControllerEmu\Control\Input.cpp" />
- <ClCompile Include="ControllerEmu\Control\Output.cpp" />
- <ClCompile Include="ControllerEmu\ControlGroup\AnalogStick.cpp" />
- <ClCompile Include="ControllerEmu\ControlGroup\Buttons.cpp" />
- <ClCompile Include="ControllerEmu\ControlGroup\ControlGroup.cpp" />
- <ClCompile Include="ControllerEmu\ControlGroup\Cursor.cpp" />
- <ClCompile Include="ControllerEmu\ControlGroup\Attachments.cpp" />
- <ClCompile Include="ControllerEmu\ControlGroup\Force.cpp" />
- <ClCompile Include="ControllerEmu\ControlGroup\MixedTriggers.cpp" />
- <ClCompile Include="ControllerEmu\ControlGroup\ModifySettingsButton.cpp" />
- <ClCompile Include="ControllerEmu\ControlGroup\Slider.cpp" />
- <ClCompile Include="ControllerEmu\ControlGroup\Tilt.cpp" />
- <ClCompile Include="ControllerEmu\ControlGroup\Triggers.cpp" />
- <ClCompile Include="ControllerEmu\Setting\NumericSetting.cpp" />
- <ClCompile Include="ControllerInterface\ControllerInterface.cpp" />
- <ClCompile Include="ControllerInterface\Device.cpp" />
- <ClCompile Include="ControllerInterface\DInput\DInput.cpp" />
- <ClCompile Include="ControllerInterface\DInput\DInputJoystick.cpp" />
- <ClCompile Include="ControllerInterface\DInput\DInputKeyboardMouse.cpp" />
- <ClCompile Include="ControllerInterface\DInput\XInputFilter.cpp" />
- <ClCompile Include="ControllerInterface\DualShockUDPClient\DualShockUDPClient.cpp" />
- <ClCompile Include="ControlReference\ControlReference.cpp" />
- <ClCompile Include="ControlReference\ExpressionParser.cpp" />
- <ClCompile Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.cpp" />
- <ClCompile Include="ControllerInterface\Win32\Win32.cpp" />
- <ClCompile Include="ControllerInterface\Wiimote\Wiimote.cpp" />
- <ClCompile Include="ControllerInterface\XInput\XInput.cpp" />
- <ClCompile Include="ControlReference\FunctionExpression.cpp" />
- <ClCompile Include="DynamicInputTextureConfiguration.cpp" />
- <ClCompile Include="DynamicInputTextureManager.cpp" />
- <ClCompile Include="GCAdapter.cpp" />
- <ClCompile Include="ImageOperations.cpp" />
- <ClCompile Include="InputConfig.cpp" />
- <ClCompile Include="InputProfile.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="ControllerEmu\ControlGroup\IMUAccelerometer.h" />
- <ClInclude Include="ControllerEmu\ControlGroup\IMUCursor.h" />
- <ClInclude Include="ControllerEmu\ControlGroup\IMUGyroscope.h" />
- <ClInclude Include="ControllerEmu\ControllerEmu.h" />
- <ClInclude Include="ControllerEmu\StickGate.h" />
- <ClInclude Include="ControllerEmu\Control\Control.h" />
- <ClInclude Include="ControllerEmu\Control\Input.h" />
- <ClInclude Include="ControllerEmu\Control\Output.h" />
- <ClInclude Include="ControllerEmu\ControlGroup\AnalogStick.h" />
- <ClInclude Include="ControllerEmu\ControlGroup\Buttons.h" />
- <ClInclude Include="ControllerEmu\ControlGroup\ControlGroup.h" />
- <ClInclude Include="ControllerEmu\ControlGroup\Cursor.h" />
- <ClInclude Include="ControllerEmu\ControlGroup\Attachments.h" />
- <ClInclude Include="ControllerEmu\ControlGroup\Force.h" />
- <ClInclude Include="ControllerEmu\ControlGroup\MixedTriggers.h" />
- <ClInclude Include="ControllerEmu\ControlGroup\ModifySettingsButton.h" />
- <ClInclude Include="ControllerEmu\ControlGroup\Slider.h" />
- <ClInclude Include="ControllerEmu\ControlGroup\Tilt.h" />
- <ClInclude Include="ControllerEmu\ControlGroup\Triggers.h" />
- <ClInclude Include="ControllerEmu\Setting\NumericSetting.h" />
- <ClInclude Include="ControllerInterface\ControllerInterface.h" />
- <ClInclude Include="ControllerInterface\Device.h" />
- <ClInclude Include="ControllerInterface\DInput\DInput.h" />
- <ClInclude Include="ControllerInterface\DInput\DInput8.h" />
- <ClInclude Include="ControllerInterface\DInput\DInputJoystick.h" />
- <ClInclude Include="ControllerInterface\DInput\DInputKeyboardMouse.h" />
- <ClInclude Include="ControllerInterface\DInput\XInputFilter.h" />
- <ClInclude Include="ControllerInterface\DualShockUDPClient\DualShockUDPClient.h" />
- <ClInclude Include="ControllerInterface\DualShockUDPClient\DualShockUDPProto.h" />
- <ClInclude Include="ControlReference\ControlReference.h" />
- <ClInclude Include="ControlReference\FunctionExpression.h" />
- <ClInclude Include="ControlReference\ExpressionParser.h" />
- <ClInclude Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.h" />
- <ClInclude Include="ControllerInterface\Win32\Win32.h" />
- <ClInclude Include="ControllerInterface\Wiimote\Wiimote.h" />
- <ClInclude Include="ControllerInterface\XInput\XInput.h" />
- <ClInclude Include="DynamicInputTextureConfiguration.h" />
- <ClInclude Include="DynamicInputTextureManager.h" />
- <ClInclude Include="GCAdapter.h" />
- <ClInclude Include="GCPadStatus.h" />
- <ClInclude Include="ImageOperations.h" />
- <ClInclude Include="InputConfig.h" />
- <ClInclude Include="InputProfile.h" />
- </ItemGroup>
- <ItemGroup>
- <Text Include="CMakeLists.txt" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="$(CoreDir)Common\Common.vcxproj">
- <Project>{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}</Project>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters
deleted file mode 100644
index 17f6cdf489..0000000000
--- a/Source/Core/InputCommon/InputCommon.vcxproj.filters
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="ControllerInterface">
- <UniqueIdentifier>{3a755a86-0efa-4396-bf79-bb3a1910764d}</UniqueIdentifier>
- </Filter>
- <Filter Include="ControllerInterface\ForceFeedback">
- <UniqueIdentifier>{e10ce316-283c-4be0-848d-578dec2b6404}</UniqueIdentifier>
- </Filter>
- <Filter Include="ControllerEmu">
- <UniqueIdentifier>{4c839215-4085-4e34-a960-7960986ad015}</UniqueIdentifier>
- </Filter>
- <Filter Include="ControllerEmu\Control">
- <UniqueIdentifier>{19ddd862-a1e3-479b-b638-bb31700c5171}</UniqueIdentifier>
- </Filter>
- <Filter Include="ControllerEmu\ControlGroup">
- <UniqueIdentifier>{e805231c-dc4e-4540-8bf8-8c567f3d00ae}</UniqueIdentifier>
- </Filter>
- <Filter Include="ControllerEmu\Setting">
- <UniqueIdentifier>{ce661cb4-f23f-4ab2-952d-402d381735e5}</UniqueIdentifier>
- </Filter>
- <Filter Include="ControllerInterface\Win32">
- <UniqueIdentifier>{6ca06b20-d8f6-4622-97ab-eefbc66edbd5}</UniqueIdentifier>
- </Filter>
- <Filter Include="ControllerInterface\DInput">
- <UniqueIdentifier>{0289ef91-50f5-4c16-9fa4-ff4c4d8208e7}</UniqueIdentifier>
- </Filter>
- <Filter Include="ControllerInterface\XInput">
- <UniqueIdentifier>{07bad1aa-7e03-4f5c-ade2-a44857c5cbc3}</UniqueIdentifier>
- </Filter>
- <Filter Include="ControllerInterface\DualShockUDPClient">
- <UniqueIdentifier>{ff02580e-3a62-4de4-a135-3a6c2c339a90}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="GCAdapter.cpp" />
- <ClCompile Include="InputConfig.cpp" />
- <ClCompile Include="ControllerEmu\ControllerEmu.cpp">
- <Filter>ControllerEmu</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\StickGate.cpp">
- <Filter>ControllerEmu</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\Control\Control.cpp">
- <Filter>ControllerEmu\Control</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\Control\Input.cpp">
- <Filter>ControllerEmu\Control</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\Control\Output.cpp">
- <Filter>ControllerEmu\Control</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\ControlGroup\AnalogStick.cpp">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\ControlGroup\Buttons.cpp">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\ControlGroup\ControlGroup.cpp">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\ControlGroup\Cursor.cpp">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\ControlGroup\Force.cpp">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\ControlGroup\MixedTriggers.cpp">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\ControlGroup\ModifySettingsButton.cpp">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\ControlGroup\Slider.cpp">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\ControlGroup\Tilt.cpp">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\ControlGroup\Triggers.cpp">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\Setting\NumericSetting.cpp">
- <Filter>ControllerEmu\Setting</Filter>
- </ClCompile>
- <ClCompile Include="ControllerInterface\DInput\DInput.cpp">
- <Filter>ControllerInterface\DInput</Filter>
- </ClCompile>
- <ClCompile Include="ControllerInterface\DInput\DInputJoystick.cpp">
- <Filter>ControllerInterface\DInput</Filter>
- </ClCompile>
- <ClCompile Include="ControllerInterface\DInput\DInputKeyboardMouse.cpp">
- <Filter>ControllerInterface\DInput</Filter>
- </ClCompile>
- <ClCompile Include="ControllerInterface\XInput\XInput.cpp">
- <Filter>ControllerInterface\XInput</Filter>
- </ClCompile>
- <ClCompile Include="ControllerInterface\Device.cpp">
- <Filter>ControllerInterface</Filter>
- </ClCompile>
- <ClCompile Include="ControllerInterface\ControllerInterface.cpp">
- <Filter>ControllerInterface</Filter>
- </ClCompile>
- <ClCompile Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.cpp">
- <Filter>ControllerInterface\ForceFeedback</Filter>
- </ClCompile>
- <ClCompile Include="ControllerInterface\DInput\XInputFilter.cpp">
- <Filter>ControllerInterface\DInput</Filter>
- </ClCompile>
- <ClCompile Include="ControllerInterface\Win32\Win32.cpp">
- <Filter>ControllerInterface\Win32</Filter>
- </ClCompile>
- <ClCompile Include="ControllerInterface\Wiimote\Wiimote.cpp">
- <Filter>ControllerInterface\Wiimote</Filter>
- </ClCompile>
- <ClCompile Include="ControlReference\ExpressionParser.cpp">
- <Filter>ControllerInterface</Filter>
- </ClCompile>
- <ClCompile Include="ControlReference\ControlReference.cpp">
- <Filter>ControllerInterface</Filter>
- </ClCompile>
- <ClCompile Include="ControlReference\FunctionExpression.cpp">
- <Filter>ControllerInterface</Filter>
- </ClCompile>
- <ClCompile Include="InputProfile.cpp" />
- <ClCompile Include="ControllerEmu\ControlGroup\Attachments.cpp">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\ControlGroup\IMUCursor.cpp">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\ControlGroup\IMUAccelerometer.cpp">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClCompile>
- <ClCompile Include="ControllerEmu\ControlGroup\IMUGyroscope.cpp">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClCompile>
- <ClCompile Include="ControllerInterface\DualShockUDPClient\DualShockUDPClient.cpp">
- <Filter>ControllerInterface\DualShockUDPClient</Filter>
- </ClCompile>
- <ClCompile Include="DynamicInputTextureConfiguration.cpp" />
- <ClCompile Include="DynamicInputTextureManager.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="GCAdapter.h" />
- <ClInclude Include="GCPadStatus.h" />
- <ClInclude Include="InputConfig.h" />
- <ClInclude Include="ControllerEmu\ControllerEmu.h">
- <Filter>ControllerEmu</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\StickGate.h">
- <Filter>ControllerEmu</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\Control\Control.h">
- <Filter>ControllerEmu\Control</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\Control\Input.h">
- <Filter>ControllerEmu\Control</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\Control\Output.h">
- <Filter>ControllerEmu\Control</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\ControlGroup\AnalogStick.h">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\ControlGroup\Buttons.h">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\ControlGroup\ControlGroup.h">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\ControlGroup\Cursor.h">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\ControlGroup\Force.h">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\ControlGroup\MixedTriggers.h">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\ControlGroup\ModifySettingsButton.h">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\ControlGroup\Slider.h">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\ControlGroup\Tilt.h">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\ControlGroup\Triggers.h">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\Setting\NumericSetting.h">
- <Filter>ControllerEmu\Setting</Filter>
- </ClInclude>
- <ClInclude Include="ControllerInterface\DInput\DInput.h">
- <Filter>ControllerInterface\DInput</Filter>
- </ClInclude>
- <ClInclude Include="ControllerInterface\DInput\DInputJoystick.h">
- <Filter>ControllerInterface\DInput</Filter>
- </ClInclude>
- <ClInclude Include="ControllerInterface\DInput\DInputKeyboardMouse.h">
- <Filter>ControllerInterface\DInput</Filter>
- </ClInclude>
- <ClInclude Include="ControllerInterface\XInput\XInput.h">
- <Filter>ControllerInterface\XInput</Filter>
- </ClInclude>
- <ClInclude Include="ControllerInterface\ControllerInterface.h">
- <Filter>ControllerInterface</Filter>
- </ClInclude>
- <ClInclude Include="ControllerInterface\Device.h">
- <Filter>ControllerInterface</Filter>
- </ClInclude>
- <ClInclude Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.h">
- <Filter>ControllerInterface\ForceFeedback</Filter>
- </ClInclude>
- <ClInclude Include="ControllerInterface\DInput\DInput8.h">
- <Filter>ControllerInterface\DInput</Filter>
- </ClInclude>
- <ClInclude Include="ControllerInterface\DInput\XInputFilter.h">
- <Filter>ControllerInterface\DInput</Filter>
- </ClInclude>
- <ClInclude Include="ControllerInterface\Win32\Win32.h">
- <Filter>ControllerInterface\Win32</Filter>
- </ClInclude>
- <ClInclude Include="ControllerInterface\Wiimote\Wiimote.h">
- <Filter>ControllerInterface\Wiimote</Filter>
- </ClInclude>
- <ClInclude Include="ControlReference\ExpressionParser.h">
- <Filter>ControllerInterface</Filter>
- </ClInclude>
- <ClInclude Include="ControlReference\ControlReference.h">
- <Filter>ControllerInterface</Filter>
- </ClInclude>
- <ClInclude Include="InputProfile.h" />
- <ClInclude Include="ControllerEmu\ControlGroup\Attachments.h">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\ControlGroup\IMUCursor.h">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\ControlGroup\IMUAccelerometer.h">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClInclude>
- <ClInclude Include="ControllerEmu\ControlGroup\IMUGyroscope.h">
- <Filter>ControllerEmu\ControlGroup</Filter>
- </ClInclude>
- <ClInclude Include="ControlReference\FunctionExpression.h" />
- <ClInclude Include="ControllerInterface\DualShockUDPClient\DualShockUDPClient.h">
- <Filter>ControllerInterface\DualShockUDPClient</Filter>
- </ClInclude>
- <ClInclude Include="ControllerInterface\DualShockUDPClient\DualShockUDPProto.h">
- <Filter>ControllerInterface\DualShockUDPClient</Filter>
- </ClInclude>
- <ClInclude Include="DynamicInputTextureConfiguration.h" />
- <ClInclude Include="DynamicInputTextureManager.h" />
- </ItemGroup>
- <ItemGroup>
- <Text Include="CMakeLists.txt" />
- </ItemGroup>
-</Project>