diff options
| author | LC <mathew1800@gmail.com> | 2020-08-22 20:13:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-22 20:13:25 -0400 |
| commit | 4a34b74e6882a20edbcf2399dc8f9b397e62d82a (patch) | |
| tree | 609b0ac136e08d8cf8c0547a1c0b66748bbac898 /Source/Core/InputCommon | |
| parent | f3431f3ff8d944b4103cf426aa1f1f69220e206a (diff) | |
| parent | 1104fcf8073ae81fb56df95b788b386784c597c7 (diff) | |
Merge pull request #9035 from shuffle2/vs-pretty
misc vcxproj cleanup
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/InputCommon.vcxproj | 50 |
1 files changed, 8 insertions, 42 deletions
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj index b5c9ef0bef..b451760354 100644 --- a/Source/Core/InputCommon/InputCommon.vcxproj +++ b/Source/Core/InputCommon/InputCommon.vcxproj @@ -1,46 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|ARM64"> - <Configuration>Debug</Configuration> - <Platform>ARM64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|ARM64"> - <Configuration>Release</Configuration> - <Platform>ARM64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> +<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> - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <PlatformToolset>v142</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="$(VSPropsDir)Configuration.StaticLibrary.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> + <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="..\..\VSProps\Base.props" /> - <Import Project="..\..\VSProps\PCHUse.props" /> + <Import Project="$(VSPropsDir)Base.props" /> + <Import Project="$(VSPropsDir)PCHUse.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> <ItemGroup> @@ -78,13 +50,7 @@ <ClCompile Include="ControllerInterface\Wiimote\Wiimote.cpp" /> <ClCompile Include="ControllerInterface\XInput\XInput.cpp" /> <ClCompile Include="ControlReference\FunctionExpression.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="GCAdapter.cpp" /> <ClCompile Include="InputConfig.cpp" /> <ClCompile Include="InputProfile.cpp" /> </ItemGroup> |