djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

windows/msvc: Change the way sources are listed. 

Reserve sources.props for listing just the MicroPython core and extmod
files, similar to how py.mk lists port-independent source files.  This
allows reusing the source list, for instance for building mpy-cross.  The
sources for building the executable itself are listed in the corresponding
project file, similar to how the other ports specify the source files in
their Makefile.
This commit is contained in:
stijn 2017-08-16 10:32:47 +02:00 committed by Damien George
parent 146c32a141
commit 6957939604
2 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ports/windows/micropython.vcxproj
View File

@ -81,9 +81,27 @@
<ClCompile /> <ClCompile />
<Link /> <Link />
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup>
</ItemGroup>
<Import Project="msvc/sources.props" /> <Import Project="msvc/sources.props" />
<ItemGroup>
<ClCompile Include="@(PyCoreSource)" />
<ClCompile Include="@(PyExtModSource)" />
<ClCompile Include="$(PyBaseDir)lib\mp-readline\*.c" />
<ClCompile Include="$(PyBaseDir)ports\windows\*.c" />
<ClCompile Include="$(PyBaseDir)ports\windows\msvc\*.c" />
<ClCompile Include="$(PyBaseDir)ports\unix\file.c"/>
<ClCompile Include="$(PyBaseDir)ports\unix\gccollect.c"/>
<ClCompile Include="$(PyBaseDir)ports\unix\input.c"/>
<ClCompile Include="$(PyBaseDir)ports\unix\main.c"/>
<ClCompile Include="$(PyBaseDir)ports\unix\modos.c"/>
<ClCompile Include="$(PyBaseDir)ports\unix\modtime.c"/>
<ClCompile Include="$(PyBaseDir)ports\unix\modmachine.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="@(PyCoreInclude)" />
<ClInclude Include="@(PyExtModInclude)" />
<ClInclude Include="$(PyBaseDir)ports\windows\*.h" />
<ClInclude Include="$(PyBaseDir)ports\windows\msvc\*.h" />
</ItemGroup>
<Import Project="msvc/genhdr.targets" /> <Import Project="msvc/genhdr.targets" />
<Import Project="$(CustomPropsFile)" Condition="exists('$(CustomPropsFile)')" /> <Import Project="$(CustomPropsFile)" Condition="exists('$(CustomPropsFile)')" />
<Target Name="GenHeaders" BeforeTargets="BuildGenerateSources" DependsOnTargets="GenerateHeaders"> <Target Name="GenHeaders" BeforeTargets="BuildGenerateSources" DependsOnTargets="GenerateHeaders">

48
ports/windows/msvc/sources.props
View File

@ -2,37 +2,25 @@
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/> <Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(PyBaseDir)py\*.c" /> <PyCoreSource Include="$(PyBaseDir)py\*.c" />
<ClCompile Include="$(PyBaseDir)ports\windows\*.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\machine_mem.c" />
<ClCompile Include="$(PyBaseDir)ports\windows\msvc\*.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\machine_pinbase.c" />
<ClCompile Include="$(PyBaseDir)lib\mp-readline\*.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\machine_pulse.c" />
<ClCompile Include="$(PyBaseDir)lib\utils\printf.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\machine_signal.c" />
<ClCompile Include="$(PyBaseDir)ports\unix\file.c"/> <PyExtModSource Include="$(PyBaseDir)extmod\modubinascii.c" />
<ClCompile Include="$(PyBaseDir)ports\unix\gccollect.c"/> <PyExtModSource Include="$(PyBaseDir)extmod\moductypes.c" />
<ClCompile Include="$(PyBaseDir)ports\unix\input.c"/> <PyExtModSource Include="$(PyBaseDir)extmod\moduhashlib.c" />
<ClCompile Include="$(PyBaseDir)ports\unix\main.c"/> <PyExtModSource Include="$(PyBaseDir)extmod\moduheapq.c" />
<ClCompile Include="$(PyBaseDir)ports\unix\modos.c"/> <PyExtModSource Include="$(PyBaseDir)extmod\modujson.c" />
<ClCompile Include="$(PyBaseDir)ports\unix\modtime.c"/> <PyExtModSource Include="$(PyBaseDir)extmod\modurandom.c" />
<ClCompile Include="$(PyBaseDir)ports\unix\modmachine.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\modure.c" />
<ClCompile Include="$(PyBaseDir)extmod\machine_mem.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\modutimeq.c" />
<ClCompile Include="$(PyBaseDir)extmod\machine_pinbase.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\moduzlib.c" />
<ClCompile Include="$(PyBaseDir)extmod\machine_pulse.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\utime_mphal.c" />
<ClCompile Include="$(PyBaseDir)extmod\machine_signal.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\virtpin.c" />
<ClCompile Include="$(PyBaseDir)extmod\modubinascii.c" />
<ClCompile Include="$(PyBaseDir)extmod\moductypes.c" />
<ClCompile Include="$(PyBaseDir)extmod\moduhashlib.c" />
<ClCompile Include="$(PyBaseDir)extmod\moduheapq.c" />
<ClCompile Include="$(PyBaseDir)extmod\modujson.c" />
<ClCompile Include="$(PyBaseDir)extmod\modurandom.c" />
<ClCompile Include="$(PyBaseDir)extmod\modure.c" />
<ClCompile Include="$(PyBaseDir)extmod\modutimeq.c" />
<ClCompile Include="$(PyBaseDir)extmod\moduzlib.c" />
<ClCompile Include="$(PyBaseDir)extmod\utime_mphal.c" />
<ClCompile Include="$(PyBaseDir)extmod\virtpin.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(PyBaseDir)py\*.h" /> <PyCoreInclude Include="$(PyBaseDir)py\*.h" />
<ClInclude Include="$(PyBaseDir)ports\windows\*.h" /> <PyExtModInclude Include="$(PyBaseDir)extmod\*.h" />
<ClInclude Include="$(PyBaseDir)ports\windows\msvc\*.h" />
</ItemGroup> </ItemGroup>
</Project> </Project>