diff options
| author | Opportunity <[email protected]> | 2019-11-24 17:47:47 +0800 |
|---|---|---|
| committer | Opportunity <[email protected]> | 2019-11-24 17:47:47 +0800 |
| commit | a69f6893fd449d00fe95cdf1a10d918c2613021c (patch) | |
| tree | 684e16c5825e68ab870194967cf434062b67ca08 | |
| parent | e29cec3bf1d41f5dda984dabf48c21b7aaa8ba3b (diff) | |
normalize sdkver
4 files changed, 6 insertions, 1 deletions
diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.props b/xmake/plugins/project/vsxmake/vsproj/Xmake.props index 19cacd77b..3cce0878a 100644 --- a/xmake/plugins/project/vsxmake/vsproj/Xmake.props +++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.props @@ -47,6 +47,10 @@ <XmakeRebuildFile Condition="'$(XmakeRebuildFile)' == ''">false</XmakeRebuildFile> </PropertyGroup> + <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)' == '' And '$(XmakeWindowsSdkVersion)' != ''"> + <WindowsTargetPlatformVersion>$(XmakeWindowsSdkVersion)</WindowsTargetPlatformVersion> + </PropertyGroup> + <PropertyGroup Condition="'$(PlatformToolset)' == ''"> <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset> <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset> diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets index 40ef5fc05..60c263d30 100644 --- a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets +++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets @@ -130,6 +130,7 @@ MSBuild Properties: XmakeFilename: $(XmakeFilename) XmakeKind: $(XmakeKind) XmakeCudaVersion: $(XmakeCudaVersion) + XmakeWindowsSdkVersion: $(XmakeWindowsSdkVersion) XmakeMfcKind: $(XmakeMfcKind) XmakeDefines: $(XmakeDefines) XmakeLanguages: $(XmakeLanguages) diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/#target#.vcxproj b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/#target#.vcxproj index 323ed1a25..9083dc278 100644 --- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/#target#.vcxproj +++ b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/#target#.vcxproj @@ -22,7 +22,6 @@ <XmakeProjectDir>#projectdir#</XmakeProjectDir> <XmakeProjectFile>#projectfile#</XmakeProjectFile> <XmakeTarget>#target#</XmakeTarget> - <WindowsTargetPlatformVersion>#sdkver#</WindowsTargetPlatformVersion> </PropertyGroup> <PropertyGroup Label="XmakeProgram"> <XmakeProgramDir Condition="'$(XmakeProgramDir)' == ''">$(XMAKE_PROGRAM_DIR)</XmakeProgramDir> diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakeConfig(mode,arch) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakeConfig(mode,arch) index 320a661fb..76a1ff3ff 100644 --- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakeConfig(mode,arch) +++ b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakeConfig(mode,arch) @@ -8,6 +8,7 @@ <XmakeDefines>#defines#</XmakeDefines> <XmakeLanguages>#languages#</XmakeLanguages> <XmakeCudaVersion>#cudaver#</XmakeCudaVersion> + <XmakeWindowsSdkVersion>#sdkver#</XmakeWindowsSdkVersion> <XmakeMfcKind>#mfckind#</XmakeMfcKind> <XmakeRunEnvs>#runenvs#</XmakeRunEnvs> <XmakeConfigFlags>#configflags#</XmakeConfigFlags> |