mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-21 11:51:48 +02:00
6a75ea5653
ControllerEmu, the class, is essentially acting like a namespace for ControlGroup. This makes it impossible to forward declare any of the internals. It also globs a bunch of classes together which is kind of a pain to manage. This splits ControlGroup and the classes it contains into their own source files and situates them all within a namespace, which gets them out of global scope. Since this allows forward declarations for the once-internal classes, it now requires significantly less files to be rebuilt if anything is changed in the ControllerEmu portion of code. It does not split out the settings classes yet, however, as it would be preferable to make a settings base class that all settings derive from, but this would be a functional change -- this commit only intends to move around existing code. Extracting the settings class will be done in another commit.
114 lines
5.9 KiB
XML
114 lines
5.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
<ItemGroup Label="ProjectConfigurations">
|
|
<ProjectConfiguration Include="Debug|x64">
|
|
<Configuration>Debug</Configuration>
|
|
<Platform>x64</Platform>
|
|
</ProjectConfiguration>
|
|
<ProjectConfiguration Include="Release|x64">
|
|
<Configuration>Release</Configuration>
|
|
<Platform>x64</Platform>
|
|
</ProjectConfiguration>
|
|
</ItemGroup>
|
|
<PropertyGroup Label="Globals">
|
|
<ProjectGuid>{6BBD47CF-91FD-4077-B676-8B76980178A9}</ProjectGuid>
|
|
</PropertyGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
<PropertyGroup Label="Configuration">
|
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
<PlatformToolset>v140</PlatformToolset>
|
|
<CharacterSet>Unicode</CharacterSet>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
|
|
<UseDebugLibraries>true</UseDebugLibraries>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
|
|
<UseDebugLibraries>false</UseDebugLibraries>
|
|
</PropertyGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
<ImportGroup Label="ExtensionSettings">
|
|
</ImportGroup>
|
|
<ImportGroup Label="PropertySheets">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
<Import Project="..\..\VSProps\Base.props" />
|
|
<Import Project="..\..\VSProps\PCHUse.props" />
|
|
</ImportGroup>
|
|
<PropertyGroup Label="UserMacros" />
|
|
<ItemGroup>
|
|
<ClCompile Include="ControllerEmu\ControllerEmu.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\Extension.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="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="ControlReference\ControlReference.cpp" />
|
|
<ClCompile Include="ControlReference\ExpressionParser.cpp" />
|
|
<ClCompile Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.cpp" />
|
|
<ClCompile Include="ControllerInterface\XInput\XInput.cpp" />
|
|
<ClCompile Include="GCAdapter.cpp">
|
|
<!--
|
|
Disable "nonstandard extension used : zero-sized array in struct/union" warning,
|
|
which is hit in libusb.h.
|
|
-->
|
|
<DisableSpecificWarnings>4200;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
|
</ClCompile>
|
|
<ClCompile Include="InputConfig.cpp" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<ClInclude Include="ControllerEmu\ControllerEmu.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\Extension.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="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="ControlReference\ControlReference.h" />
|
|
<ClInclude Include="ControlReference\ExpressionParser.h" />
|
|
<ClInclude Include="ControllerInterface\ForceFeedback\ForceFeedbackDevice.h" />
|
|
<ClInclude Include="ControllerInterface\XInput\XInput.h" />
|
|
<ClInclude Include="GCAdapter.h" />
|
|
<ClInclude Include="GCPadStatus.h" />
|
|
<ClInclude Include="InputConfig.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>
|