diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2019-01-13 19:08:11 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2019-01-13 19:08:11 -0600 |
| commit | 3b1848368ffe8220973b12de2f76fdc8c0114683 (patch) | |
| tree | d2946df9cad33238e6120b2c55e878de2370804d /src/Cpp.Build.props | |
| parent | 7cd37cc8fe8064654ea4cc80a7ecb6bfffb21f89 (diff) | |
| download | wix-3b1848368ffe8220973b12de2f76fdc8c0114683.tar.gz wix-3b1848368ffe8220973b12de2f76fdc8c0114683.tar.bz2 wix-3b1848368ffe8220973b12de2f76fdc8c0114683.zip | |
Update to latest Cpp.Build.props for locating latest Win10 SDK.
Remove unused Microsoft.VisualStudio.Setup.Configuration.Native package.
Diffstat (limited to 'src/Cpp.Build.props')
| -rw-r--r-- | src/Cpp.Build.props | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props index 296b36ca..0e00132b 100644 --- a/src/Cpp.Build.props +++ b/src/Cpp.Build.props | |||
| @@ -8,6 +8,10 @@ | |||
| 8 | <OutDir>$(OutputPath)$(Platform)\</OutDir> | 8 | <OutDir>$(OutputPath)$(Platform)\</OutDir> |
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'=='15.0'"> | ||
| 12 | <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 13 | </PropertyGroup> | ||
| 14 | |||
| 11 | <ItemDefinitionGroup> | 15 | <ItemDefinitionGroup> |
| 12 | <ClCompile> | 16 | <ClCompile> |
| 13 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> | 17 | <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> |
| @@ -16,7 +20,7 @@ | |||
| 16 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 20 | <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 17 | <PrecompiledHeader>Use</PrecompiledHeader> | 21 | <PrecompiledHeader>Use</PrecompiledHeader> |
| 18 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> | 22 | <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> |
| 19 | <CallingConvention>StdCall</CallingConvention> | 23 | <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> |
| 20 | <TreatWarningAsError>true</TreatWarningAsError> | 24 | <TreatWarningAsError>true</TreatWarningAsError> |
| 21 | <ExceptionHandling>false</ExceptionHandling> | 25 | <ExceptionHandling>false</ExceptionHandling> |
| 22 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> | 26 | <AdditionalOptions>-YlprecompDefine</AdditionalOptions> |