summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-03-18 00:57:57 +0800
committerruki <[email protected]>2021-03-18 00:57:57 +0800
commit25e9c7ab3ce1f45137423b49e7ef5214d7735a8e (patch)
tree318597f6daa6e2cce57f7b08b68486a07f455559
parent9e02f32de0afd0079d8137e58f679652d34010be (diff)
improve rebuild for vsxmake
-rw-r--r--xmake/plugins/project/vsxmake/vsproj/Xmake.targets14
1 files changed, 7 insertions, 7 deletions
diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets
index 638c7dd04..9a23799c1 100644
--- a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets
+++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets
@@ -103,6 +103,11 @@
<Exec StdOutEncoding="utf-8" StdErrEncoding="utf-8" Command="$(_XmakeEnv)
$(_XmakeExecutable) build $(_XmakeCommonFlags) $(_XmakeBuildFlags) $(XmakeTarget)" EchoOff="true" Condition="'$(XmakeDefault)' != 'false'" />
</Target>
+ <Target Name="_XmakeRebuild" DependsOnTargets="_XmakeProjCheck">
+ <Message Text="$xmake build -r $(_XmakeCommonFlags) $(_XmakeBuildFlags) $(XmakeTarget)" Importance="High" Condition="'$(XmakeDefault)' != 'false'" />
+ <Exec StdOutEncoding="utf-8" StdErrEncoding="utf-8" Command="$(_XmakeEnv)
+ $(_XmakeExecutable) build -r $(_XmakeCommonFlags) $(_XmakeBuildFlags) $(XmakeTarget)" EchoOff="true" Condition="'$(XmakeDefault)' != 'false'" />
+ </Target>
<Target Name="_XmakeBuildFile" DependsOnTargets="_XmakeProjCheck">
<ItemGroup>
<SelectedFile Include="$(SelectedFiles)" />
@@ -213,7 +218,7 @@ MSBuild Properties:
<Target Name="Clean" Condition="'$(DesignTimeBuild)' != 'true'">
<CallTarget Targets="Show" Condition="$(XmakeDiagnosis)" />
<CallTarget Targets="BeforeClean" />
- <CallTarget Targets="_XmakeClean;_XmakeConfig" />
+ <CallTarget Targets="_XmakeConfig;_XmakeClean" />
<CallTarget Targets="AfterClean" />
</Target>
@@ -222,12 +227,7 @@ MSBuild Properties:
<Target Name="Rebuild" Condition="'$(DesignTimeBuild)' != 'true'">
<CallTarget Targets="Show" Condition="$(XmakeDiagnosis)" />
<CallTarget Targets="BeforeRebuild" />
- <CallTarget Targets="BeforeClean" />
- <CallTarget Targets="_XmakeClean;_XmakeConfig" />
- <CallTarget Targets="AfterClean" />
- <CallTarget Targets="BeforeBuild" />
- <CallTarget Targets="_XmakeBuild" />
- <CallTarget Targets="AfterBuild" />
+ <CallTarget Targets="_XmakeConfig;_XmakeRebuild" />
<CallTarget Targets="AfterRebuild" />
</Target>