diff options
| author | OpportunityLiu <[email protected]> | 2019-07-22 11:52:22 +0800 |
|---|---|---|
| committer | OpportunityLiu <[email protected]> | 2019-07-22 12:07:03 +0800 |
| commit | 74924c6ef483e358cc22adef9a555bcdf3c4ce4d (patch) | |
| tree | 5ea5eeacd01a532886100c322ad4fc34e6b00b91 | |
| parent | 98c3052c933d988aa9e56aa433c433e7274164db (diff) | |
fix vsxmake debugger settings
| -rw-r--r-- | xmake/plugins/project/vsxmake/vsproj/Xmake.props | 11 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/vsproj/Xmake.targets | 15 |
2 files changed, 15 insertions, 11 deletions
diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.props b/xmake/plugins/project/vsxmake/vsproj/Xmake.props index 55fd2bdc5..0b60d77d2 100644 --- a/xmake/plugins/project/vsxmake/vsproj/Xmake.props +++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.props @@ -126,6 +126,17 @@ <IntDir>$(XmakeBuilDir)\.vs\$(TargetName)\$(XmakeArch)\$(XmakeMode)\</IntDir> </PropertyGroup> + <PropertyGroup Label="Debugger"> + <LocalDebuggerWorkingDirectory>$(XmakeRunDir)</LocalDebuggerWorkingDirectory> + <LocalDebuggerEnvironment>$(XmakeRunEnvs) +$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment> + <LocalDebuggerMergeEnvironment>true</LocalDebuggerMergeEnvironment> + <RemoteDebuggerWorkingDirectory>$(XmakeRunDir)</RemoteDebuggerWorkingDirectory> + <DebuggerFlavor>WindowsRemoteDebugger</DebuggerFlavor> + <RemoteDebuggerEnvironment>$(XmakeRunEnvs) +$(RemoteDebuggerEnvironment)</RemoteDebuggerEnvironment> + </PropertyGroup> + <!-- Common files --> <ItemGroup> <None Condition="Exists('$(MSBuildProjectDirectory)\Xmake.Custom.props')" diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets index 8aa2db642..781a0468f 100644 --- a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets +++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets @@ -37,17 +37,6 @@ <XmakeRunDirResolved>$([System.IO.Path]::GetFullPath('$(XmakeRunDirResolved)/'))</XmakeRunDirResolved> </PropertyGroup> - <PropertyGroup Label="Debugger"> - <LocalDebuggerWorkingDirectory>$(XmakeRunDirResolved)</LocalDebuggerWorkingDirectory> - <LocalDebuggerEnvironment>$(XmakeRunEnvs) -$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment> - <LocalDebuggerMergeEnvironment>true</LocalDebuggerMergeEnvironment> - <RemoteDebuggerWorkingDirectory>$(XmakeRunDirResolved)</RemoteDebuggerWorkingDirectory> - <DebuggerFlavor>WindowsRemoteDebugger</DebuggerFlavor> - <RemoteDebuggerEnvironment>$(XmakeRunEnvs) -$(RemoteDebuggerEnvironment)</RemoteDebuggerEnvironment> - </PropertyGroup> - <PropertyGroup Label="XmakeInternal"> <_XmakeProjectFlag Condition="'$(XmakeProjectFile)' != ''">-F "$(XmakeProjectFile)"</_XmakeProjectFlag> <_XmakeProjectFlag Condition="'$(XmakeProjectFile)' == ''">-P .</_XmakeProjectFlag> @@ -150,15 +139,19 @@ MSBuild Properties: XmakeProjectDir: $(XmakeProjectDir) XmakeScriptDir: $(XmakeScriptDir) XmakeBuilDir: $(XmakeBuilDir) + XmakeTargetDir: $(XmakeTargetDir) XmakeConfigDir: $(XmakeConfigDir) XmakeConfigFileDir: $(XmakeConfigFileDir) + XmakeRunDir: $(XmakeRunDir) Xmake Resolved Path: XmakeProgramDir: $(XmakeProgramDirResolved) XmakeProjectDir: $(XmakeProjectDirResolved) XmakeScriptDir: $(XmakeScriptDirResolved) XmakeBuilDir: $(XmakeBuilDirResolved) + XmakeTargetDir: $(XmakeTargetDirResolved) XmakeConfigDir: $(XmakeConfigDirResolved) XmakeConfigFileDir: $(XmakeConfigFileDirResolved) + XmakeRunDir: $(XmakeRunDirResolved) Xmake Flags: XmakeWarning: $(XmakeWarning) XmakeVerbose: $(XmakeVerbose) |