diff options
| author | ruki <[email protected]> | 2019-08-14 22:16:12 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-08-14 22:16:12 +0800 |
| commit | 636cc3ff586ca54a8dfdf222f502cd2f6db9ece1 (patch) | |
| tree | a85dcff87cd75a8001a9a6194fe85cce91a37f69 /xmake/plugins/project | |
| parent | e339a14e189e57fb8bf4ff778a7d170cf6af2c1c (diff) | |
| parent | 454f1c64dae6c213177007885e54a1ab497f4b1b (diff) | |
Merge pull request #526 from orzuk-lmj/dev
provide sources path for vs searching
Diffstat (limited to 'xmake/plugins/project')
| -rw-r--r-- | xmake/plugins/project/vsxmake/getinfo.lua | 1 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/vsproj/Xmake.props | 1 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakePath(mode,arch) | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua index 8f456bc38..0c033b145 100644 --- a/xmake/plugins/project/vsxmake/getinfo.lua +++ b/xmake/plugins/project/vsxmake/getinfo.lua @@ -159,6 +159,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(target:values("project.vsxmake.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> |