diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-09-26 13:00:28 (GMT) |
|---|---|---|
| committer | larryhastings <larry@hastings.org> | 2017-09-26 13:00:28 (GMT) |
| commit | 44c1b62939a6192776dc9d093546154044cb2ecb (patch) | |
| tree | 9fcdcc36abeee8bf22323d095890e9683a1d8f52 | |
| parent | f2492bb6aae061aea47e21fc7e56b7ab9bfdf543 (diff) | |
| download | cpython-44c1b62939a6192776dc9d093546154044cb2ecb.zip cpython-44c1b62939a6192776dc9d093546154044cb2ecb.tar.gz cpython-44c1b62939a6192776dc9d093546154044cb2ecb.tar.bz2 | |
[3.5] bpo-31170: Fix inclusion of expat in Windows build projects. (#3751)
* bpo-31170: Fix inclusion of expat in Windows build projects.
* Fixes line endings
| -rw-r--r-- | PCbuild/_elementtree.vcxproj | 3 | ||||
| -rw-r--r-- | PCbuild/_elementtree.vcxproj.filters | 6 | ||||
| -rw-r--r-- | PCbuild/pyexpat.vcxproj | 1 | ||||
| -rw-r--r-- | PCbuild/pyexpat.vcxproj.filters | 6 |
4 files changed, 15 insertions, 1 deletions
diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj index 639ba47..12f3bd2 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -86,6 +86,7 @@ <ClInclude Include="..\Modules\expat\xmltok.h" /> </ItemGroup> <ItemGroup> + <ClCompile Include="..\Modules\expat\loadlibrary.c" /> <ClCompile Include="..\Modules\_elementtree.c" /> <ClCompile Include="..\Modules\expat\xmlparse.c" /> <ClCompile Include="..\Modules\expat\xmlrole.c" /> @@ -103,4 +104,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters index ee78295..e36301c 100644 --- a/PCbuild/_elementtree.vcxproj.filters +++ b/PCbuild/_elementtree.vcxproj.filters @@ -68,5 +68,11 @@ <ClCompile Include="..\Modules\expat\xmltok.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\Modules\expat\loadlibrary.c"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="..\PC\python_nt.rc" /> </ItemGroup> </Project>
\ No newline at end of file diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj index a2763f0..0bed878 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -67,6 +67,7 @@ <ClInclude Include="..\Modules\expat\xmltok.h" /> </ItemGroup> <ItemGroup> + <ClCompile Include="..\Modules\expat\loadlibrary.c" /> <ClCompile Include="..\Modules\pyexpat.c" /> <ClCompile Include="..\Modules\expat\xmlparse.c" /> <ClCompile Include="..\Modules\expat\xmlrole.c" /> diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters index abf362f..919a9ad 100644 --- a/PCbuild/pyexpat.vcxproj.filters +++ b/PCbuild/pyexpat.vcxproj.filters @@ -29,5 +29,11 @@ <ClCompile Include="..\Modules\expat\xmltok.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\Modules\expat\loadlibrary.c"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="..\PC\python_nt.rc" /> </ItemGroup> </Project>
\ No newline at end of file |