FS-10876: [Build-System] Fix build in Visual Studio 2017 and Windows SDK 10.

This commit is contained in:
Andrey Volk
2018-01-10 23:30:24 +03:00
parent 7f9e6f3e4b
commit e380b41a8e
9 changed files with 37 additions and 22 deletions
+4 -4
View File
@@ -20,7 +20,7 @@
AfterTargets="$(YASMAfterTargets)"
Condition="'@(YASM)' != ''"
DependsOnTargets="$(YASMDependsOn);ComputeYASMOutput"
Outputs="@(YASM->'%(ObjectFile)')"
Outputs="@(YASM->'%(ObjectFileName)')"
Inputs="@(YASM);%(YASM.AdditionalDependencies);$(MSBuildProjectFile)">
<ItemGroup
Condition="'@(SelectedFiles)' != ''">
@@ -30,8 +30,8 @@
</ItemGroup>
<ItemGroup>
<YASM_tlog
Include="%(YASM.ObjectFile)"
Condition="'%(YASM.ObjectFile)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'">
Include="%(YASM.ObjectFileName)"
Condition="'%(YASM.ObjectFileName)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'">
<Source>@(YASM, '|')</Source>
</YASM_tlog>
</ItemGroup>
@@ -50,7 +50,7 @@
IncludePaths="%(YASM.IncludePaths)"
Defines="%(YASM.Defines)"
UnDefines="%(YASM.UnDefines)"
ObjectFile="%(YASM.ObjectFile)"
ObjectFile="%(YASM.ObjectFileName)"
ListFile="%(YASM.ListFile)"
MapFile="%(YASM.MapFile)"
ErrorFile="%(YASM.ErrorFile)"