diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2019-01-13 19:05:05 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2019-01-13 19:05:05 -0600 |
| commit | 9b42d1d2f0fc13085f5f8d9ce8e420f556c55814 (patch) | |
| tree | 9de0c44cf777c137d562e8eb3e1e218c8dd06269 | |
| parent | ffc71665d46608d39dd414dee8a0be2c742df046 (diff) | |
| download | wix-9b42d1d2f0fc13085f5f8d9ce8e420f556c55814.tar.gz wix-9b42d1d2f0fc13085f5f8d9ce8e420f556c55814.tar.bz2 wix-9b42d1d2f0fc13085f5f8d9ce8e420f556c55814.zip | |
Update to latest Cpp.Build.props for locating latest Win10 SDK.
| -rw-r--r-- | src/Cpp.Build.props | 6 | ||||
| -rw-r--r-- | src/ca/vsca.vcxproj | 1 |
2 files changed, 5 insertions, 2 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> |
diff --git a/src/ca/vsca.vcxproj b/src/ca/vsca.vcxproj index f80b7215..c52840bf 100644 --- a/src/ca/vsca.vcxproj +++ b/src/ca/vsca.vcxproj | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | <CharacterSet>Unicode</CharacterSet> | 24 | <CharacterSet>Unicode</CharacterSet> |
| 25 | <ProjectModuleDefinitionFile>vsca.def</ProjectModuleDefinitionFile> | 25 | <ProjectModuleDefinitionFile>vsca.def</ProjectModuleDefinitionFile> |
| 26 | <Description>WiX Toolset VS CustomAction</Description> | 26 | <Description>WiX Toolset VS CustomAction</Description> |
| 27 | <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> | ||
| 28 | </PropertyGroup> | 27 | </PropertyGroup> |
| 29 | 28 | ||
| 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |