Merge pull request #2537 from Domain/vs_args

Add runtime arguments in project file. Fix #2536

4 files changed, 9 insertions, 0 deletions

diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
index a3063038f..e45947482 100644
--- a/xmake/plugins/project/vsxmake/getinfo.lua
+++ b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -227,6 +227,11 @@ function _make_targetinfo(mode, arch, target)
     end
     targetinfo.runenvs = table.concat(runenvstr, "\n")
 
+    local runargs = target:get("runargs")
+    if runargs then
+        targetinfo.runargs = os.args(table.wrap(runargs))
+    end
+
     -- use mfc? save the mfc runtime kind
     if target:rule("win.sdk.mfc.shared_app") or target:rule("win.sdk.mfc.shared") then
         targetinfo.mfckind = "Dynamic"
diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.props b/xmake/plugins/project/vsxmake/vsproj/Xmake.props
index a7faaa1ad..9fa9f7ea1 100644
--- a/xmake/plugins/project/vsxmake/vsproj/Xmake.props
+++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.props
@@ -159,10 +159,12 @@
     <LocalDebuggerWorkingDirectory>$(XmakeRunDir)</LocalDebuggerWorkingDirectory>
     <LocalDebuggerEnvironment>$(XmakeRunEnvs)
 $(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
+    <LocalDebuggerCommandArguments>$(XmakeRunArgs)</LocalDebuggerCommandArguments>
     <LocalDebuggerMergeEnvironment>true</LocalDebuggerMergeEnvironment>
     <RemoteDebuggerWorkingDirectory>$(XmakeRunDir)</RemoteDebuggerWorkingDirectory>
     <RemoteDebuggerEnvironment>$(XmakeRunEnvs)
 $(RemoteDebuggerEnvironment)</RemoteDebuggerEnvironment>
+    <RemoteDebuggerCommandArguments>$(XmakeRunArgs)</RemoteDebuggerCommandArguments>
   </PropertyGroup>
 
   <!-- Common files -->
diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets
index ad5777293..39b7da128 100644
--- a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets
+++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets
@@ -146,6 +146,7 @@ MSBuild Properties:
     XmakeSourceDirs: $(XmakeSourceDirs)
     XmakePrecompiledHeader: $(XmakePrecompiledHeader)
     XmakeRunEnvs: $(XmakeRunEnvs)
+    XmakeRunArgs: $(XmakeRunArgs)
   Xmake Path:
     XmakeProgramDir: $(XmakeProgramDir)
     XmakeProjectDir: $(XmakeProjectDir)
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 4832d8e93..6d5b4165d 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakeConfig(mode,arch)
+++ b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj/XmakeConfig(mode,arch)
@@ -13,6 +13,7 @@
     <XmakeWindowsSdkVersion>#sdkver#</XmakeWindowsSdkVersion>
     <XmakeMfcKind>#mfckind#</XmakeMfcKind>
     <XmakeRunEnvs>#runenvs#</XmakeRunEnvs>
+    <XmakeRunArgs>#runargs#</XmakeRunArgs>
     <XmakeConfigFlags>#configflags#</XmakeConfigFlags>
     <XmakeIncludeDirs>#includedirs#</XmakeIncludeDirs>
     <XmakeLinkDirs>#linkdirs#</XmakeLinkDirs>