mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-27 00:05:34 +01:00
32a0dae257
Hotkeys Make a new class that inherits from InputConfigDialog with a specialised constructor. The changes are mainly the top portion and it now uses tabs to categorise the hotkeys. Redo the GCPad configuration dialog The layout is similar, but it now allows flexibility to change it more easily. Redo the GC Keyboard configuration dialog Same layout. Redo completely the Wiimote configuration dialog Separated the controls into 2 tabs to make them less imposing overall. Redo the Nunchuk configuration dialog Similar layout, except for 2 control group sizers. Redo the Classic controller configuration dialog Same layout. Redo the Guitar input configuration dialog Stacked 2 sets of group together. Redo the Turntable configuration dialog More stacked groups and the window is much less wide.
302 lines
16 KiB
XML
302 lines
16 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>{47411FDB-1BF2-48D0-AB4E-C7C41160F898}</ProjectGuid>
|
|
<ProjectName>Dolphin</ProjectName>
|
|
</PropertyGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
<PropertyGroup Label="Configuration">
|
|
<ConfigurationType>Application</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" />
|
|
<ItemDefinitionGroup>
|
|
<Link>
|
|
<BaseAddress>0x00400000</BaseAddress>
|
|
<RandomizedBaseAddress>false</RandomizedBaseAddress>
|
|
<FixedBaseAddress>true</FixedBaseAddress>
|
|
<AdditionalLibraryDirectories>$(ExternalsDir)ffmpeg\lib;$(ExternalsDir)OpenAL\$(PlatformName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
<AdditionalDependencies>iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
|
|
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/NODEFAULTLIB:libcmt %(AdditionalOptions)</AdditionalOptions>
|
|
</Link>
|
|
<ResourceCompile>
|
|
<AdditionalIncludeDirectories>$(ExternalsDir)wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
</ResourceCompile>
|
|
<ClCompile />
|
|
<ClCompile />
|
|
<Manifest>
|
|
<EnableDpiAwareness>true</EnableDpiAwareness>
|
|
</Manifest>
|
|
</ItemDefinitionGroup>
|
|
<ItemGroup>
|
|
<ClCompile Include="AboutDolphin.cpp" />
|
|
<ClCompile Include="Cheats\ActionReplayCodesPanel.cpp" />
|
|
<ClCompile Include="Cheats\ARCodeAddEdit.cpp" />
|
|
<ClCompile Include="Cheats\CheatSearchTab.cpp" />
|
|
<ClCompile Include="Cheats\CheatsWindow.cpp" />
|
|
<ClCompile Include="Cheats\CreateCodeDialog.cpp" />
|
|
<ClCompile Include="Cheats\GeckoCodeDiag.cpp" />
|
|
<ClCompile Include="Config\AdvancedConfigPane.cpp" />
|
|
<ClCompile Include="Config\AudioConfigPane.cpp" />
|
|
<ClCompile Include="Config\ConfigMain.cpp" />
|
|
<ClCompile Include="Config\GameCubeConfigPane.cpp" />
|
|
<ClCompile Include="Config\GCAdapterConfigDiag.cpp" />
|
|
<ClCompile Include="Config\GeneralConfigPane.cpp" />
|
|
<ClCompile Include="Config\InterfaceConfigPane.cpp" />
|
|
<ClCompile Include="Config\PathConfigPane.cpp" />
|
|
<ClCompile Include="Config\WiiConfigPane.cpp" />
|
|
<ClCompile Include="Debugger\BreakpointDlg.cpp" />
|
|
<ClCompile Include="Debugger\BreakpointView.cpp" />
|
|
<ClCompile Include="Debugger\BreakpointWindow.cpp" />
|
|
<ClCompile Include="Debugger\CodeView.cpp" />
|
|
<ClCompile Include="Debugger\CodeWindow.cpp" />
|
|
<ClCompile Include="Debugger\CodeWindowFunctions.cpp" />
|
|
<ClCompile Include="Debugger\DebuggerPanel.cpp" />
|
|
<ClCompile Include="Debugger\DebuggerUIUtil.cpp" />
|
|
<ClCompile Include="Debugger\DSPDebugWindow.cpp" />
|
|
<ClCompile Include="Debugger\DSPRegisterView.cpp" />
|
|
<ClCompile Include="Debugger\JitWindow.cpp" />
|
|
<ClCompile Include="Debugger\MemoryCheckDlg.cpp" />
|
|
<ClCompile Include="Debugger\MemoryView.cpp" />
|
|
<ClCompile Include="Debugger\MemoryWindow.cpp" />
|
|
<ClCompile Include="Debugger\RegisterView.cpp" />
|
|
<ClCompile Include="Debugger\RegisterWindow.cpp" />
|
|
<ClCompile Include="Debugger\WatchView.cpp" />
|
|
<ClCompile Include="Debugger\WatchWindow.cpp" />
|
|
<ClCompile Include="DolphinSlider.cpp" />
|
|
<ClCompile Include="NetPlay\ChangeGameDialog.cpp" />
|
|
<ClCompile Include="NetPlay\MD5Dialog.cpp" />
|
|
<ClCompile Include="NetPlay\NetPlayLauncher.cpp" />
|
|
<ClCompile Include="NetPlay\NetPlaySetupFrame.cpp" />
|
|
<ClCompile Include="NetPlay\NetWindow.cpp" />
|
|
<ClCompile Include="FifoPlayerDlg.cpp" />
|
|
<ClCompile Include="Frame.cpp" />
|
|
<ClCompile Include="FrameAui.cpp" />
|
|
<ClCompile Include="FrameTools.cpp" />
|
|
<ClCompile Include="GameListCtrl.cpp" />
|
|
<ClCompile Include="Input\InputConfigDiag.cpp" />
|
|
<ClCompile Include="Input\InputConfigDiagBitmaps.cpp" />
|
|
<ClCompile Include="Input\HotkeyInputConfigDiag.cpp" />
|
|
<ClCompile Include="Input\GCPadInputConfigDiag.cpp" />
|
|
<ClCompile Include="Input\GCKeyboardInputConfigDiag.cpp" />
|
|
<ClCompile Include="Input\WiimoteInputConfigDiag.cpp" />
|
|
<ClCompile Include="Input\NunchukInputConfigDiag.cpp" />
|
|
<ClCompile Include="Input\ClassicInputConfigDiag.cpp" />
|
|
<ClCompile Include="Input\GuitarInputConfigDiag.cpp" />
|
|
<ClCompile Include="Input\DrumsInputConfigDiag.cpp" />
|
|
<ClCompile Include="Input\TurntableInputConfigDiag.cpp" />
|
|
<ClCompile Include="ISOFile.cpp" />
|
|
<ClCompile Include="ISOProperties.cpp" />
|
|
<ClCompile Include="LogConfigWindow.cpp" />
|
|
<ClCompile Include="LogWindow.cpp" />
|
|
<ClCompile Include="Main.cpp" />
|
|
<ClCompile Include="MainMenuBar.cpp" />
|
|
<ClCompile Include="MainNoGUI.cpp">
|
|
<ExcludedFromBuild>true</ExcludedFromBuild>
|
|
</ClCompile>
|
|
<ClCompile Include="MainToolBar.cpp" />
|
|
<ClCompile Include="MemcardManager.cpp" />
|
|
<ClCompile Include="NetPlay\PadMapDialog.cpp" />
|
|
<ClCompile Include="PatchAddEdit.cpp" />
|
|
<ClCompile Include="SoftwareVideoConfigDialog.cpp" />
|
|
<ClCompile Include="TASInputDlg.cpp" />
|
|
<ClCompile Include="VideoConfigDiag.cpp" />
|
|
<ClCompile Include="PostProcessingConfigDiag.cpp" />
|
|
<ClCompile Include="ControllerConfigDiag.cpp" />
|
|
<ClCompile Include="WxEventUtils.cpp" />
|
|
<ClCompile Include="WXInputBase.cpp" />
|
|
<ClCompile Include="WxUtils.cpp" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<ClInclude Include="Cheats\ActionReplayCodesPanel.h" />
|
|
<ClInclude Include="Cheats\ARCodeAddEdit.h" />
|
|
<ClInclude Include="Config\AdvancedConfigPane.h" />
|
|
<ClInclude Include="Config\AudioConfigPane.h" />
|
|
<ClInclude Include="Config\GameCubeConfigPane.h" />
|
|
<ClInclude Include="Config\GCAdapterConfigDiag.h" />
|
|
<ClInclude Include="Config\GeneralConfigPane.h" />
|
|
<ClInclude Include="Config\InterfaceConfigPane.h" />
|
|
<ClInclude Include="Config\PathConfigPane.h" />
|
|
<ClInclude Include="Config\WiiConfigPane.h" />
|
|
<ClInclude Include="DolphinSlider.h" />
|
|
<ClInclude Include="NetPlay\ChangeGameDialog.h" />
|
|
<ClInclude Include="NetPlay\MD5Dialog.h" />
|
|
<ClInclude Include="NetPlay\NetPlayLauncher.h" />
|
|
<ClInclude Include="NetPlay\NetPlaySetupFrame.h" />
|
|
<ClInclude Include="NetPlay\PadMapDialog.h" />
|
|
<ClInclude Include="resource.h" />
|
|
<ClInclude Include="AboutDolphin.h" />
|
|
<ClInclude Include="Cheats\CheatSearchTab.h" />
|
|
<ClInclude Include="Cheats\CheatsWindow.h" />
|
|
<ClInclude Include="Cheats\CreateCodeDialog.h" />
|
|
<ClInclude Include="Cheats\GeckoCodeDiag.h" />
|
|
<ClInclude Include="Config\ConfigMain.h" />
|
|
<ClInclude Include="Debugger\BreakpointDlg.h" />
|
|
<ClInclude Include="Debugger\BreakpointView.h" />
|
|
<ClInclude Include="Debugger\BreakpointWindow.h" />
|
|
<ClInclude Include="Debugger\CodeView.h" />
|
|
<ClInclude Include="Debugger\CodeWindow.h" />
|
|
<ClInclude Include="Debugger\DebuggerPanel.h" />
|
|
<ClInclude Include="Debugger\DebuggerUIUtil.h" />
|
|
<ClInclude Include="Debugger\DSPDebugWindow.h" />
|
|
<ClInclude Include="Debugger\DSPRegisterView.h" />
|
|
<ClInclude Include="Debugger\JitWindow.h" />
|
|
<ClInclude Include="Debugger\MemoryCheckDlg.h" />
|
|
<ClInclude Include="Debugger\MemoryView.h" />
|
|
<ClInclude Include="Debugger\MemoryWindow.h" />
|
|
<ClInclude Include="Debugger\RegisterView.h" />
|
|
<ClInclude Include="Debugger\RegisterWindow.h" />
|
|
<ClInclude Include="Debugger\WatchView.h" />
|
|
<ClInclude Include="Debugger\WatchWindow.h" />
|
|
<ClInclude Include="NetPlay\NetWindow.h" />
|
|
<ClInclude Include="FifoPlayerDlg.h" />
|
|
<ClInclude Include="Frame.h" />
|
|
<ClInclude Include="GameListCtrl.h" />
|
|
<ClInclude Include="Globals.h" />
|
|
<ClInclude Include="Input\InputConfigDiag.h" />
|
|
<ClInclude Include="Input\HotkeyInputConfigDiag.h" />
|
|
<ClInclude Include="Input\GCPadInputConfigDiag.h" />
|
|
<ClInclude Include="Input\GCKeyboardInputConfigDiag.h" />
|
|
<ClInclude Include="Input\WiimoteInputConfigDiag.h" />
|
|
<ClInclude Include="Input\NunchukInputConfigDiag.h" />
|
|
<ClInclude Include="Input\ClassicInputConfigDiag.h" />
|
|
<ClInclude Include="Input\GuitarInputConfigDiag.h" />
|
|
<ClInclude Include="Input\DrumsInputConfigDiag.h" />
|
|
<ClInclude Include="Input\TurntableInputConfigDiag.h" />
|
|
<ClInclude Include="ISOFile.h" />
|
|
<ClInclude Include="ISOProperties.h" />
|
|
<ClInclude Include="LogConfigWindow.h" />
|
|
<ClInclude Include="LogWindow.h" />
|
|
<ClInclude Include="Main.h" />
|
|
<ClInclude Include="MainMenuBar.h" />
|
|
<ClInclude Include="MainToolBar.h" />
|
|
<ClInclude Include="MemcardManager.h" />
|
|
<ClInclude Include="PatchAddEdit.h" />
|
|
<ClInclude Include="SoftwareVideoConfigDialog.h" />
|
|
<ClInclude Include="TASInputDlg.h" />
|
|
<ClInclude Include="VideoConfigDiag.h" />
|
|
<ClInclude Include="PostProcessingConfigDiag.h" />
|
|
<ClInclude Include="ControllerConfigDiag.h" />
|
|
<ClInclude Include="WxEventUtils.h" />
|
|
<ClInclude Include="WXInputBase.h" />
|
|
<ClInclude Include="WxUtils.h" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<Text Include="CMakeLists.txt" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<ResourceCompile Include="DolphinWX.rc" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<Image Include="$(CoreDir)..\..\Installer\Dolphin.ico" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<ProjectReference Include="$(ExternalsDir)Bochs_disasm\Bochs_disasm.vcxproj">
|
|
<Project>{8ada04d7-6db1-4da4-ab55-64fb12a0997b}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(ExternalsDir)libpng\png\png.vcxproj">
|
|
<Project>{4c9f135b-a85e-430c-bad4-4c67ef5fc12c}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(ExternalsDir)LZO\LZO.vcxproj">
|
|
<Project>{ab993f38-c31d-4897-b139-a620c42bc565}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(ExternalsDir)SFML\build\vc2010\SFML_Network.vcxproj">
|
|
<Project>{93d73454-2512-424e-9cda-4bb357fe13dd}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(ExternalsDir)wxWidgets3\build\msw\wx_base.vcxproj">
|
|
<Project>{1c8436c9-dbaf-42be-83bc-cf3ec9175abe}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj">
|
|
<Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(CoreDir)AudioCommon\AudioCommon.vcxproj">
|
|
<Project>{54aa7840-5beb-4a0c-9452-74ba4cc7fd44}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(CoreDir)Common\Common.vcxproj">
|
|
<Project>{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(CoreDir)Common\SCMRevGen.vcxproj">
|
|
<Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(CoreDir)Core\Core.vcxproj">
|
|
<Project>{e54cf649-140e-4255-81a5-30a673c1fb36}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(CoreDir)DiscIO\DiscIO.vcxproj">
|
|
<Project>{160bdc25-5626-4b0d-bdd8-2953d9777fb5}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(CoreDir)InputCommon\InputCommon.vcxproj">
|
|
<Project>{6bbd47cf-91fd-4077-b676-8b76980178a9}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(CoreDir)UICommon\UICommon.vcxproj">
|
|
<Project>{604C8368-F34A-4D55-82C8-CC92A0C13254}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(CoreDir)VideoBackends\D3D\D3D.vcxproj">
|
|
<Project>{96020103-4ba5-4fd2-b4aa-5b6d24492d4e}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(CoreDir)VideoBackends\OGL\OGL.vcxproj">
|
|
<Project>{ec1a314c-5588-4506-9c1e-2e58e5817f75}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(CoreDir)VideoBackends\Software\Software.vcxproj">
|
|
<Project>{a4c423aa-f57c-46c7-a172-d1a777017d29}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(CoreDir)VideoBackends\Null\Null.vcxproj">
|
|
<Project>{53A5391B-737E-49A8-BC8F-312ADA00736F}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(CoreDir)VideoBackends\Vulkan\Vulkan.vcxproj">
|
|
<Project>{29F29A19-F141-45AD-9679-5A2923B49DA3}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(CoreDir)VideoCommon\VideoCommon.vcxproj">
|
|
<Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(CoreDir)VideoBackends\D3D12\D3D12.vcxproj">
|
|
<Project>{570215b7-e32f-4438-95ae-c8d955f9fca3}</Project>
|
|
</ProjectReference>
|
|
</ItemGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
<ImportGroup Label="ExtensionTargets">
|
|
</ImportGroup>
|
|
<!--Copy Exe, Data directory and DLLs which should be located in the executable directory-->
|
|
<ItemGroup>
|
|
<DataSysFiles Include="$(DolphinRootDir)Data\**\Sys\**\*.*" />
|
|
<DataTxtFiles Include="$(DolphinRootDir)Data\license.txt" />
|
|
<ExternalDlls Include="$(ExternalsDir)OpenAL\$(PlatformName)\*.dll" />
|
|
<BinaryFiles Include="$(TargetPath)" />
|
|
<AllInputFiles Include="@(DataSysFiles);@(DataTxtFiles);@(ExternalDlls);@(BinaryFiles)" />
|
|
</ItemGroup>
|
|
<Target Name="AfterBuild" Inputs="@(AllInputFiles)" Outputs="@(AllInputFiles -> '$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(Extension)')">
|
|
<Message Text="Copying Data directory..." Importance="High" />
|
|
<Copy SourceFiles="@(DataSysFiles)" DestinationFolder="$(BinaryOutputDir)%(RecursiveDir)" Condition="!Exists('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(DataSysFiles.Extension)') OR $([System.DateTime]::Parse('%(ModifiedTime)').Ticks) > $([System.IO.File]::GetLastWriteTime('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(DataSysFiles.Extension)').Ticks)" />
|
|
<Copy SourceFiles="@(DataTxtFiles)" DestinationFolder="$(BinaryOutputDir)" Condition="!Exists('$(BinaryOutputDir)%(Filename)%(DataTxtFiles.Extension)') OR $([System.DateTime]::Parse('%(ModifiedTime)').Ticks) > $([System.IO.File]::GetLastWriteTime('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(DataTxtFiles.Extension)').Ticks)" />
|
|
<Message Text="Copying External .dlls" Importance="High" />
|
|
<Copy SourceFiles="@(ExternalDlls)" DestinationFolder="$(BinaryOutputDir)" Condition="!Exists('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(ExternalDlls.Extension)') OR $([System.DateTime]::Parse('%(ModifiedTime)').Ticks) > $([System.IO.File]::GetLastWriteTime('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(ExternalDlls.Extension)').Ticks)" />
|
|
<Message Text="Copy: @(BinaryFiles) -> $(BinaryOutputDir)" Importance="High" />
|
|
<Copy SourceFiles="@(BinaryFiles)" DestinationFolder="$(BinaryOutputDir)" />
|
|
</Target>
|
|
</Project>
|