diff options
| -rw-r--r-- | ports/windows/msvc/genhdr.targets | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/ports/windows/msvc/genhdr.targets b/ports/windows/msvc/genhdr.targets index 78e57a34e..ed97a455d 100644 --- a/ports/windows/msvc/genhdr.targets +++ b/ports/windows/msvc/genhdr.targets @@ -18,8 +18,14 @@ <PyPython Condition="'$(PyPython)' == ''">python</PyPython> <CLToolExe Condition="'$(CLToolExe)' == ''">cl.exe</CLToolExe> <PyClTool>$([System.IO.Path]::Combine(`$(CLToolPath)`, `$(CLToolExe)`))</PyClTool> + <PyPlatformToolsetNum>120</PyPlatformToolsetNum> <!--Minimum we support is VS2013.--> + <PyPlatformToolsetNum Condition="$(PlatformToolset.StartsWith('v'))">$(PlatformToolset.Replace('v', ''))</PyPlatformToolsetNum> + <PyParallelPreProc Condition="'$(PyPlatformToolsetNum)' > '140'">True</PyParallelPreProc> <!--VS2017 and up.--> </PropertyGroup> + <UsingTask Condition="'$(PyParallelPreProc)' == 'True'" + TaskName="ParallelCustomBuild" AssemblyFile="$(VCTargetsPath)\Microsoft.Build.CppTasks.Common.dll"/> + <Target Name="MakeDestDir"> <MakeDir Directories="$(DestDir)"/> </Target> @@ -57,6 +63,7 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) { <PyIncDirs Include="$(PyIncDirs)"/> <PreProcDefs Include="%(ClCompile.PreProcessorDefinitions);NO_QSTR"/> <PyQstrSourceFiles Include="@(ClCompile)" Exclude="$(PyBuildDir)\frozen_content.c"> + <Changed>False</Changed> <OutFile>$([System.String]::new('%(FullPath)').Replace('$(PyBaseDir)', '$(DestDir)qstr\'))</OutFile> </PyQstrSourceFiles> <PyQstrSourceFiles> @@ -71,13 +78,21 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) { </QstrDependencies> </ItemGroup> <PropertyGroup> + <PyPreProcCommand>$(PyClTool) /nologo /I@(PyIncDirs, ' /I') /D@(PreProcDefs, ' /D')</PyPreProcCommand> <ForceQstrRebuild>@(QstrDependencies->AnyHaveMetadataValue('Changed', 'True'))</ForceQstrRebuild> <RunPreProcConcat>@(PyQstrSourceFiles->AnyHaveMetadataValue('Changed', 'True'))</RunPreProcConcat> </PropertyGroup> + <ItemGroup> + <PyQstrSourceFilesToPreProc Include="@(PyQstrSourceFiles)" Condition="'%(Changed)' == 'True' Or '$(ForceQstrRebuild)' == 'True'"> + <Command>$(PyPreProcCommand) /Fi%(OutFile) /P %(Identity)</Command> + <Outputs>%(OutFile)</Outputs> + </PyQstrSourceFilesToPreProc> + </ItemGroup> + + <MakeDir Directories="@(PyQstrSourceFilesToPreProc->'%(OutDir)')"/> + <Exec Condition="'$(PyParallelPreProc)' != 'True'" Command="%(PyQstrSourceFilesToPreProc.Command)" /> + <ParallelCustomBuild Condition="'$(PyParallelPreProc)' == 'True' And '@(PyQstrSourceFilesToPreProc)' != ''" Sources="@(PyQstrSourceFilesToPreProc)" /> - <MakeDir Directories="@(PyQstrSourceFiles->'%(OutDir)')"/> - <Exec Command="$(PyClTool) /nologo /I@(PyIncDirs, ' /I') /D@(PreProcDefs, ' /D') /Fi%(PyQstrSourceFiles.OutFile) /P %(PyQstrSourceFiles.Identity)" - Condition="'%(PyQstrSourceFiles.Changed)' == 'True' Or '$(ForceQstrRebuild)' == 'True'"/> <ConcatPreProcFiles InputFiles="@(PyQstrSourceFiles->'%(OutFile)')" OutputFile="$(DestDir)qstr.i.last" Condition="'$(RunPreProcConcat)' == 'True' Or '$(ForceQstrRebuild)' == 'True'"/> <Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py split qstr $(DestDir)qstr.i.last $(DestDir)qstr _"/> |