From 4c9584aa6fec4b7ec7ffe70b6bc5789f41496941 Mon Sep 17 00:00:00 2001
From: mclee <orzuk.lmj@gmail.com>
Date: Wed, 14 Aug 2019 17:25:39 +0800
Subject: provide sources path for vs searching

---
 xmake/plugins/project/vsxmake/getinfo.lua                                | 1 +
 xmake/plugins/project/vsxmake/vsproj/Xmake.props                         | 1 +
 .../project/vsxmake/vsproj/templates/vcxproj/XmakePath(mode,arch)        | 1 +
 3 files changed, 3 insertions(+)

(limited to 'xmake/plugins')

diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
index 906148fa2..1dd444868 100644
--- a/xmake/plugins/project/vsxmake/getinfo.lua
+++ b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -158,6 +158,7 @@ function _make_targetinfo(mode, arch, target)
     targetinfo.configfiledir = _make_dirs(target:get("configdir"))
     targetinfo.includedirs   = _make_dirs(_get_values(target, "includedirs"))
     targetinfo.linkdirs      = _make_dirs(_get_values(target, "linkdirs"))
+    targetinfo.vcsourcepaths = _make_dirs(config.get("vcsourcepaths"))
 
     -- save defines
     targetinfo.defines       = _make_arrs(_get_values(target, "defines"))
diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.props b/xmake/plugins/project/vsxmake/vsproj/Xmake.props
index a8480c1da..07c25eb22 100644
--- a/xmake/plugins/project/vsxmake/vsproj/Xmake.props
+++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.props
@@ -124,6 +124,7 @@
     <LibraryPath>$(XmakeLinkDir);$(LibraryPath)</LibraryPath>
     <OutDir>$(XmakeTargetDir)\</OutDir>
     <IntDir>$(XmakeBuilDir)\.vs\$(TargetName)\$(XmakeArch)\$(XmakeMode)\</IntDir>
+    <SourcePath>$(VC_SourcePath);$(XmakeVCSourcePaths);</SourcePath>
   </PropertyGroup>
 
   <PropertyGroup Label="Debugger">
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakePath(mode,arch) b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakePath(mode,arch)
index 42644b1f5..bc3c028b9 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakePath(mode,arch)
+++ b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakePath(mode,arch)
@@ -6,4 +6,5 @@
     <XmakeIncludeDir>#includedirs#</XmakeIncludeDir>
     <XmakeLinkDir>#linkdirs#</XmakeLinkDir>
     <XmakeRunDir>#rundir#</XmakeRunDir>
+    <XmakeVCSourcePaths>#vcsourcepaths#</XmakeVCSourcePaths>
   </PropertyGroup>
-- 
cgit v1.3.1


From 454f1c64dae6c213177007885e54a1ab497f4b1b Mon Sep 17 00:00:00 2001
From: mclee <orzuk.lmj@gmail.com>
Date: Wed, 14 Aug 2019 18:10:47 +0800
Subject: provide sources path for vs searching

---
 xmake/plugins/project/vsxmake/getinfo.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xmake/plugins')

diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
index 1dd444868..ad1804238 100644
--- a/xmake/plugins/project/vsxmake/getinfo.lua
+++ b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -158,7 +158,7 @@ function _make_targetinfo(mode, arch, target)
     targetinfo.configfiledir = _make_dirs(target:get("configdir"))
     targetinfo.includedirs   = _make_dirs(_get_values(target, "includedirs"))
     targetinfo.linkdirs      = _make_dirs(_get_values(target, "linkdirs"))
-    targetinfo.vcsourcepaths = _make_dirs(config.get("vcsourcepaths"))
+    targetinfo.vcsourcepaths = _make_dirs(target:values("project.vsxmake.vcsourcepaths"))
 
     -- save defines
     targetinfo.defines       = _make_arrs(_get_values(target, "defines"))
-- 
cgit v1.3.1