summaryrefslogtreecommitdiff
path: root/xmake/plugins
diff options
context:
space:
mode:
authorruki <[email protected]>2022-05-22 22:30:44 +0800
committerruki <[email protected]>2022-05-22 22:30:44 +0800
commitf5ecbadde8b8ccd3289cc0e8bcf1f06522c78eae (patch)
treeacb1cb3ed147f2f91c2606c3210347d25e2e0e31 /xmake/plugins
parent6b20a9e7a540337b03ec67c3a5ea5e13c03885bd (diff)
improve vsxmake
Diffstat (limited to 'xmake/plugins')
-rw-r--r--xmake/plugins/project/vsxmake/getinfo.lua4
-rw-r--r--xmake/plugins/project/vsxmake/vsproj/Xmake.props4
2 files changed, 4 insertions, 4 deletions
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
index f855b3bee..f6381e09c 100644
--- a/xmake/plugins/project/vsxmake/getinfo.lua
+++ b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -151,8 +151,8 @@ function _make_targetinfo(mode, arch, target)
targetinfo.default = tostring(target:is_default())
-- save target file
- targetinfo.basename = _escape(target:get("basename"))
- targetinfo.filename = _escape(target:get("filename"))
+ targetinfo.basename = _escape(target:basename())
+ targetinfo.filename = _escape(target:filename())
-- save dirs
targetinfo.targetdir = _make_dirs(target:get("targetdir"))
diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.props b/xmake/plugins/project/vsxmake/vsproj/Xmake.props
index 760b09b61..ba13741a4 100644
--- a/xmake/plugins/project/vsxmake/vsproj/Xmake.props
+++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.props
@@ -146,7 +146,7 @@
<TargetName Condition="'$(XmakeFilename)' != ''">$([System.IO.Path]::GetFileNameWithoutExtension('$(XmakeFilename)'))</TargetName>
<TargetExt Condition="'$(XmakeFilename)' != ''">$([System.IO.Path]::GetExtension('$(XmakeFilename)'))</TargetExt>
</PropertyGroup>
-
+
<PropertyGroup Label="Path">
<IncludePath>$(XmakeIncludeDirs);$(IncludePath)</IncludePath>
<LibraryPath>$(XmakeLinkDirs);$(LibraryPath)</LibraryPath>
@@ -178,7 +178,7 @@ $(RemoteDebuggerEnvironment)</RemoteDebuggerEnvironment>
<None Condition="'$(XmakeScriptDir)' != '$(XmakeProjectDir)' And Exists('$(XmakeScriptDir)\xmake.lua')"
Include="$(XmakeScriptDir)\xmake.lua" />
</ItemGroup>
-
+
<Import Condition="Exists('$(MSBuildProjectDirectory)\Xmake.Custom.items')"
Project="$(MSBuildProjectDirectory)\Xmake.Custom.items" />
</Project>