Revert "[PATCH #60] Fixed build warnings about inconsistencies in the output"

This reverts commit 194e6d02e9.
This commit is contained in:
Holger Vogt 2019-09-14 11:56:38 +02:00
parent ec6d676920
commit 0814c71c2c
1 changed files with 180 additions and 191 deletions

View File

@ -68,18 +68,7 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup />
<OutDir>$(ProjectDir)..\bin\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(ProjectDir)..\bin\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(ProjectDir)..\bin\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(ProjectDir)..\bin\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<WarningLevel>Level4</WarningLevel> <WarningLevel>Level4</WarningLevel>
@ -92,7 +81,7 @@
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<ProfileGuidedDatabase /> <ProfileGuidedDatabase />
<OutputFile>$(ProjectDir)..\bin\$(TargetName)$(TargetExt)</OutputFile> <OutputFile>..\bin\$(TargetName)$(TargetExt)</OutputFile>
<ProgramDatabaseFile>..\bin\$(TargetName).pdb</ProgramDatabaseFile> <ProgramDatabaseFile>..\bin\$(TargetName).pdb</ProgramDatabaseFile>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -114,7 +103,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<ProfileGuidedDatabase /> <ProfileGuidedDatabase />
<OutputFile>$(ProjectDir)..\bin\$(TargetName)$(TargetExt)</OutputFile> <OutputFile>..\bin\$(TargetName)$(TargetExt)</OutputFile>
<ProgramDatabaseFile /> <ProgramDatabaseFile />
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -132,7 +121,7 @@
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<OutputFile>$(ProjectDir)..\bin\$(TargetName)$(TargetExt)</OutputFile> <OutputFile>..\bin\$(TargetName)$(TargetExt)</OutputFile>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -151,7 +140,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<OutputFile>$(ProjectDir)..\bin\$(TargetName)$(TargetExt)</OutputFile> <OutputFile>..\bin\$(TargetName)$(TargetExt)</OutputFile>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>