From b3596005c375c35063bb2cd0ef9b93b71ed85992 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 11 Feb 2021 00:51:33 +0800 Subject: support pcheader for vsxmake --- xmake/plugins/project/vsxmake/getinfo.lua | 1 + xmake/plugins/project/vsxmake/vsproj/Xmake.props | 3 +++ xmake/plugins/project/vsxmake/vsproj/Xmake.targets | 1 + .../project/vsxmake/vsproj/templates/vcxproj/XmakeConfig(mode,arch) | 1 + 4 files changed, 6 insertions(+) (limited to 'xmake/plugins') diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua index 17131d391..435f1f3f6 100644 --- a/xmake/plugins/project/vsxmake/getinfo.lua +++ b/xmake/plugins/project/vsxmake/getinfo.lua @@ -149,6 +149,7 @@ function _make_targetinfo(mode, arch, target) targetinfo.includedirs = _make_dirs(table.join(_get_values_from_target(target, "includedirs") or {}, _get_values_from_target(target, "sysincludedirs"))) targetinfo.linkdirs = _make_dirs(_get_values_from_target(target, "linkdirs")) targetinfo.sourcedirs = _make_dirs(_get_values_from_target(target, "values.project.vsxmake.sourcedirs")) + targetinfo.pcheaderfile = target:pcheaderfile("cxx") or target:pcheaderfile("c") -- save defines targetinfo.defines = _make_arrs(_get_values_from_target(target, "defines")) diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.props b/xmake/plugins/project/vsxmake/vsproj/Xmake.props index eaa8472c4..a783c8ebc 100644 --- a/xmake/plugins/project/vsxmake/vsproj/Xmake.props +++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.props @@ -100,6 +100,9 @@ stdcpp17 stdcpplatest stdcpplatest + Use + $(XmakeProjectDir)\$(XmakePrecompiledHeader) + $(XmakeProjectDir)\$(XmakePrecompiledHeader);%(ForcedIncludeFiles) diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets index 6ec266f11..78b6e5bca 100644 --- a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets +++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets @@ -139,6 +139,7 @@ MSBuild Properties: XmakeIncludeDirs: $(XmakeIncludeDirs) XmakeLinkDirs: $(XmakeLinkDirs) XmakeSourceDirs: $(XmakeSourceDirs) + XmakePrecompiledHeader: $(XmakePrecompiledHeader) XmakeRunEnvs: $(XmakeRunEnvs) Xmake Path: XmakeProgramDir: $(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 8e1279b37..0d6eb3dd5 100644 --- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakeConfig(mode,arch) +++ b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakeConfig(mode,arch) @@ -16,4 +16,5 @@ #includedirs# #linkdirs# #sourcedirs# + #pcheaderfile# -- cgit v1.3.1