ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #733 from JunielKatarn/PropertySheets 

Set default toolset to MSVC 14
This commit is contained in:
zilmar 2015-11-10 07:52:25 +11:00
parent eef290f767 f868308394
commit a51f0197e2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Project64.sln
View File

Binary file not shown.

8
PropertySheets/Platform.props
View File

@ -2,13 +2,13 @@
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Configuration">
<PlatformToolset>v120_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<!-- All platforms settings -->
<PropertyGroup>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
@ -192,7 +192,7 @@
</Xdcmake>
</ItemDefinitionGroup>
<!-- END common platform settings -->
<!-- Win32 -->
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
<Lib>
@ -203,7 +203,7 @@
</Link>
</ItemDefinitionGroup>
<!-- END Win32 -->
<!-- x64 -->
<PropertyGroup Condition="'$(Platform)'=='x64'">
<OutDir>$(SolutionDir)bin\$(Configuration)64\</OutDir>