Skip to content

Commit c78cced

Browse files
icanhasmathicanhasmath
committed
Allow c-library dependencies to be dynamic
This is the main commit to bring python 3.7 to be compatible with the alt-build system. It is adapted from the same work for python 3.8.
1 parent 043c876 commit c78cced

File tree

10 files changed

+142
-77
lines changed

10 files changed

+142
-77
lines changed

‎Makefile.pre.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1544,7 +1544,7 @@ sharedinstall: sharedmods
15441544
$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
15451545
--prefix=$(prefix) \
15461546
--install-scripts=$(BINDIR) \
1547-
--install-platlib=$(DESTSHARED) \
1547+
--install-platlib=${exec_prefix}/lib/python$(VERSION)/lib-dynload \
15481548
--root=$(DESTDIR)/
15491549
-rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
15501550
-rm -r $(DESTDIR)$(DESTSHARED)/__pycache__

‎PCbuild/_bz2.vcxproj‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,23 +60,43 @@
6060
<PropertyGroup>
6161
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
6262
</PropertyGroup>
63-
<ItemDefinitionGroup>
63+
<ItemDefinitionGroup Condition="$(BZIP2_DIR) != ''">
64+
<ClCompile>
65+
<AdditionalIncludeDirectories>$(bz2Dir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
66+
<PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
67+
<DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
68+
</ClCompile>
69+
<Link>
70+
<AdditionalLibraryDirectories>$(bz2Dir)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
71+
<AdditionalDependencies>libbz2.lib;%(AdditionalDependencies)</AdditionalDependencies>
72+
</Link>
73+
</ItemDefinitionGroup>
74+
<ItemDefinitionGroup Condition="$(BZIP2_DIR) == ''">
6475
<ClCompile>
6576
<AdditionalIncludeDirectories>$(bz2Dir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6677
<PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6778
<DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
6879
</ClCompile>
6980
</ItemDefinitionGroup>
70-
<ItemGroup>
71-
<ClCompile Include="..\Modules\_bz2module.c" />
72-
<ClCompile Include="$(bz2Dir)\blocksort.c" />
73-
<ClCompile Include="$(bz2Dir)\bzlib.c" />
74-
<ClCompile Include="$(bz2Dir)\compress.c" />
75-
<ClCompile Include="$(bz2Dir)\crctable.c" />
76-
<ClCompile Include="$(bz2Dir)\decompress.c" />
77-
<ClCompile Include="$(bz2Dir)\huffman.c" />
78-
<ClCompile Include="$(bz2Dir)\randtable.c" />
79-
</ItemGroup>
81+
<Choose>
82+
<When Condition="$(BZIP2_DIR) == ''">
83+
<ItemGroup>
84+
<ClCompile Include="..\Modules\_bz2module.c" />
85+
<ClCompile Include="$(bz2Dir)\blocksort.c" />
86+
<ClCompile Include="$(bz2Dir)\bzlib.c" />
87+
<ClCompile Include="$(bz2Dir)\compress.c" />
88+
<ClCompile Include="$(bz2Dir)\crctable.c" />
89+
<ClCompile Include="$(bz2Dir)\decompress.c" />
90+
<ClCompile Include="$(bz2Dir)\huffman.c" />
91+
<ClCompile Include="$(bz2Dir)\randtable.c" />
92+
</ItemGroup>
93+
</When>
94+
<Otherwise>
95+
<ItemGroup>
96+
<ClCompile Include="..\Modules\_bz2module.c" />
97+
</ItemGroup>
98+
</Otherwise>
99+
</Choose>
80100
<ItemGroup>
81101
<ClInclude Include="$(bz2Dir)\bzlib.h" />
82102
<ClInclude Include="$(bz2Dir)\bzlib_private.h" />
@@ -93,4 +113,4 @@
93113
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
94114
<ImportGroup Label="ExtensionTargets">
95115
</ImportGroup>
96-
</Project>
116+
</Project>

‎PCbuild/_lzma.vcxproj‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<PropertyGroup>
6060
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
6161
</PropertyGroup>
62-
<ItemDefinitionGroup>
62+
<ItemDefinitionGroup Condition="$(LZMA_DIR) == ''">
6363
<ClCompile>
6464
<AdditionalIncludeDirectories>$(lzmaDir)src/liblzma/api;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6565
<PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -68,6 +68,15 @@
6868
<AdditionalDependencies>$(OutDir)liblzma$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>
6969
</Link>
7070
</ItemDefinitionGroup>
71+
<ItemDefinitionGroup Condition="$(LZMA_DIR) != ''">
72+
<ClCompile>
73+
<AdditionalIncludeDirectories>$(lzmaDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
74+
<PreprocessorDefinitions>WIN32;_FILE_OFFSET_BITS=64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
75+
</ClCompile>
76+
<Link>
77+
<AdditionalDependencies>$(lzmaDir)lib\liblzma.lib;%(AdditionalDependencies)</AdditionalDependencies>
78+
</Link>
79+
</ItemDefinitionGroup>
7180
<ItemGroup>
7281
<ClCompile Include="..\Modules\_lzmamodule.c" />
7382
</ItemGroup>
@@ -79,6 +88,8 @@
7988
<Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
8089
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
8190
</ProjectReference>
91+
</ItemGroup>
92+
<ItemGroup Condition="$(LZMA_DIR) == ''">
8293
<ProjectReference Include="liblzma.vcxproj">
8394
<Project>{12728250-16eC-4dc6-94d7-e21dd88947f8}</Project>
8495
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

‎PCbuild/_sqlite3.vcxproj‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,16 @@
6161
</PropertyGroup>
6262
<ItemDefinitionGroup>
6363
<ClCompile>
64-
<AdditionalIncludeDirectories>$(sqlite3Dir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
64+
<AdditionalIncludeDirectories>$(sqlite3Dir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6565
<PreprocessorDefinitions>MODULE_NAME="sqlite3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
6666
</ClCompile>
6767
</ItemDefinitionGroup>
68+
<ItemDefinitionGroup Condition="$(SQLITE3_DIR) != ''">
69+
<Link>
70+
<AdditionalLibraryDirectories>$(sqlite3Dir)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
71+
<AdditionalDependencies>sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
72+
</Link>
73+
</ItemDefinitionGroup>
6874
<ItemGroup>
6975
<ClInclude Include="..\Modules\_sqlite\cache.h" />
7076
<ClInclude Include="..\Modules\_sqlite\connection.h" />
@@ -90,7 +96,7 @@
9096
<ItemGroup>
9197
<ResourceCompile Include="..\PC\python_nt.rc" />
9298
</ItemGroup>
93-
<ItemGroup>
99+
<ItemGroup Condition="$(SQLITE3_DIR) == ''">
94100
<ProjectReference Include="pythoncore.vcxproj">
95101
<Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
96102
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -103,4 +109,4 @@
103109
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
104110
<ImportGroup Label="ExtensionTargets">
105111
</ImportGroup>
106-
</Project>
112+
</Project>

‎PCbuild/openssl.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AdditionalIncludeDirectories>$(opensslIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
66
</ClCompile>
77
<Link>
8-
<AdditionalLibraryDirectories>$(opensslOutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
8+
<AdditionalLibraryDirectories>$(opensslLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
99
<AdditionalDependencies>ws2_32.lib;libcrypto.lib;libssl.lib;%(AdditionalDependencies)</AdditionalDependencies>
1010
</Link>
1111
</ItemDefinitionGroup>
@@ -15,15 +15,15 @@
1515
<_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64</_DLLSuffix>
1616
</PropertyGroup>
1717
<ItemGroup>
18-
<_SSLDLL Include="$(opensslOutDir)\libcrypto$(_DLLSuffix).dll" />
19-
<_SSLDLL Include="$(opensslOutDir)\libcrypto$(_DLLSuffix).pdb" />
20-
<_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).dll" />
21-
<_SSLDLL Include="$(opensslOutDir)\libssl$(_DLLSuffix).pdb" />
18+
<_SSLDLL Include="$(opensslLibDir)\libcrypto$(_DLLSuffix).dll" />
19+
<_SSLDLL Include="$(opensslLibDir)\libcrypto$(_DLLSuffix).pdb" />
20+
<_SSLDLL Include="$(opensslLibDir)\libssl$(_DLLSuffix).dll" />
21+
<_SSLDLL Include="$(opensslLibDir)\libssl$(_DLLSuffix).pdb" />
2222
</ItemGroup>
2323
<Target Name="_CopySSLDLL" Inputs="@(_SSLDLL)" Outputs="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" AfterTargets="Build">
2424
<Copy SourceFiles="@(_SSLDLL)" DestinationFolder="$(OutDir)" />
2525
</Target>
2626
<Target Name="_CleanSSLDLL" BeforeTargets="Clean">
2727
<Delete Files="@(_SSLDLL->'$(OutDir)%(Filename)%(Extension)')" TreatErrorsAsWarnings="true" />
2828
</Target>
29-
</Project>
29+
</Project>

‎PCbuild/pcbuild.proj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@
5151
<Projects Include="pyshellext.vcxproj" />
5252
<!-- Extension modules -->
5353
<ExtensionModules Include="_asyncio;_ctypes;_decimal;_elementtree;_msi;_multiprocessing;_overlapped;pyexpat;_queue;select;unicodedata;winsound" />
54-
<!-- Extension modules that require external sources -->
55-
<ExternalModules Include="_bz2;_lzma;_sqlite3" />
5654
<!-- venv launchers -->
5755
<Projects Include="venvlauncher.vcxproj;venvwlauncher.vcxproj" />
5856
<!-- _ssl will build _socket as well, which may cause conflicts in parallel builds -->
57+
<ExtensionModules Include="_lzma" Condition="$(IncludeLzma) or $(IncludeExternals)" />
58+
<ExtensionModules Include="_bz2" Condition="$(IncludeBzip2) or $(IncludeExternals)" />
59+
<ExtensionModules Include="_sqlite3" Condition="$(IncludeSqlite3) or $(IncludeExternals)" />
5960
<ExtensionModules Include="_socket" Condition="!$(IncludeSSL) or !$(IncludeExternals)" />
60-
<ExternalModules Include="_ssl;_hashlib" Condition="$(IncludeSSL)" />
61-
<ExternalModules Include="_tkinter" Condition="$(IncludeTkinter)" />
62-
<ExtensionModules Include="@(ExternalModules->'%(Identity)')" Condition="$(IncludeExternals)" />
61+
<ExtensionModules Include="_ssl;_hashlib" Condition="$(IncludeSSL)" />
62+
<ExtensionModules Include="_tkinter" Condition="$(IncludeTkinter)" />
6363
<Projects Include="@(ExtensionModules->'%(Identity).vcxproj')" Condition="$(IncludeExtensions)" />
6464
<!-- Test modules -->
6565
<TestModules Include="_ctypes_test;_testbuffer;_testcapi;_testembed;_testimportmultiple;_testmultiphase;_testconsole" />

‎PCbuild/python.props‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,36 @@
5151
<Import Project="$(ExternalProps)" Condition="$(ExternalProps) != '' and Exists('$(ExternalProps)')" />
5252

5353
<PropertyGroup>
54+
<sqlite3Dir>$(SQLITE3_DIR)</sqlite3Dir>
5455
<sqlite3Dir Condition="$(sqlite3Dir) == ''">$(ExternalsDir)sqlite-3.43.0.0\</sqlite3Dir>
56+
<sqlite3Dir Condition="!HasTrailingSlash($(sqlite3Dir))">$(sqlite3Dir)\</sqlite3Dir>
57+
<bz2Dir>$(BZIP2_DIR)</bz2Dir>
5558
<bz2Dir Condition="$(bz2Dir) == ''">$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
56-
<lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.2\</lzmaDir>
59+
<bz2Dir Condition="!HasTrailingSlash($(bz2Dir))">$(bz2Dir)\</bz2Dir>
60+
<lzmaDir>$(LZMA_DIR)</lzmaDir>
61+
<lzmaDir Condition="$(lzmaDir) == ''">$(ExternalsDir)xz-5.2.5\</lzmaDir>
62+
<lzmaDir Condition="!HasTrailingSlash($(lzmaDir))">$(lzmaDir)\</lzmaDir>
63+
<libffiDir>$(FFI_DIR)</libffiDir>
64+
<libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi\$(ArchName)\</libffiDir>
65+
<libffiDir Condition="!HasTrailingSlash($(libffiDir))">$(libffiDir)\</libffiDir>
66+
<libffiIncludeDir>$(libffiDir)include</libffiIncludeDir>
67+
<libffiOutDir>$(libffiDir)</libffiOutDir>
68+
<opensslDir>$(OPENSSL_DIR)</opensslDir>
69+
<opensslIncludeDir/>
70+
<opensslLibdir/>
71+
<opensslOutDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-bin-1.1.1v\$(ArchName)\</opensslOutDir>
72+
<opensslLibDir Condition="$(opensslDir) == ''">$(opensslOutDir)</opensslLibDir>
73+
<opensslIncludeDir Condition="$(opensslDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
5774
<opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1v\</opensslDir>
58-
<opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1v\$(ArchName)\</opensslOutDir>
59-
<opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
75+
<opensslDir Condition="!HasTrailingSlash($(opensslDir))">$(opensslDir)\</opensslDir>
76+
<opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslDir)include</opensslIncludeDir>
77+
<opensslLibDir Condition="$(opensslLibDir) == ''">$(opensslDir)lib</opensslLibDir>
6078
<nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
79+
<zlibDir>$(ZLIB_DIR)</zlibDir>
6180
<zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.2.13\</zlibDir>
81+
<zlibDir Condition="!HasTrailingSlash($(zlibDir))">$(zlibDir)\</zlibDir>
82+
<zlibIncludeDir>$(zlibDir)include</zlibIncludeDir>
83+
<zlibLibDir>$(zlibDir)lib</zlibLibDir>
6284
</PropertyGroup>
6385

6486
<PropertyGroup>

‎PCbuild/pythoncore.vcxproj‎

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<PropertyGroup>
5151
<KillPython>true</KillPython>
5252
<RequirePGCFiles>true</RequirePGCFiles>
53-
<IncludeExternals Condition="$(IncludeExternals) == '' and Exists('$(zlibDir)\zlib.h')">true</IncludeExternals>
53+
<IncludeExternals Condition="$(IncludeExternals) == '' and Exists('$(zlibIncludeDir)\zlib.h')">true</IncludeExternals>
5454
<IncludeExternals Condition="$(IncludeExternals) == ''">false</IncludeExternals>
5555
</PropertyGroup>
5656
<ImportGroup Label="PropertySheets">
@@ -68,13 +68,16 @@
6868
<ItemDefinitionGroup>
6969
<ClCompile>
7070
<AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions>
71-
<AdditionalIncludeDirectories>$(PySourcePath)Python;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
72-
<AdditionalIncludeDirectories Condition="$(IncludeExternals)">$(zlibDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
73-
<PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
74-
<PreprocessorDefinitions Condition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
75-
</ClCompile>
76-
<Link>
77-
<AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
71+
<AdditionalIncludeDirectories>$(PySourcePath)Python;%(AdditionalIncludeDirectories);$(zlibIncludeDir)</AdditionalIncludeDirectories>
72+
<AdditionalIncludeDirectories Condition="$(IncludeExternals)">$(zlibIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
73+
<PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;Py_ENABLE_SHARED;_Py_HAVE_ZLIB;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
74+
</ClCompile>
75+
<Link>
76+
<AdditionalDependencies>version.lib;shlwapi.lib;ws2_32.lib;pathcch.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
77+
<AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir);%(AdditionalLibraryDirectories);$(zlibLibDir)</AdditionalLibraryDirectories>
78+
<AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">$(OutDir);%(AdditionalLibraryDirectories);$(zlibLibDir)</AdditionalLibraryDirectories>
79+
<AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">$(OutDir);%(AdditionalLibraryDirectories);$(zlibLibDir)</AdditionalLibraryDirectories>
80+
<AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir);%(AdditionalLibraryDirectories);$(zlibLibDir)</AdditionalLibraryDirectories>
7881
</Link>
7982
</ItemDefinitionGroup>
8083
<ItemGroup>
@@ -215,17 +218,17 @@
215218
<ClInclude Include="..\Python\wordcode_helpers.h" />
216219
</ItemGroup>
217220
<ItemGroup Condition="$(IncludeExternals)">
218-
<ClInclude Include="$(zlibDir)\crc32.h" />
219-
<ClInclude Include="$(zlibDir)\deflate.h" />
220-
<ClInclude Include="$(zlibDir)\inffast.h" />
221-
<ClInclude Include="$(zlibDir)\inffixed.h" />
222-
<ClInclude Include="$(zlibDir)\inflate.h" />
223-
<ClInclude Include="$(zlibDir)\inftrees.h" />
224-
<ClInclude Include="$(zlibDir)\trees.h" />
225-
<ClInclude Include="$(zlibDir)\zconf.h" />
226-
<ClInclude Include="$(zlibDir)\zconf.in.h" />
227-
<ClInclude Include="$(zlibDir)\zlib.h" />
228-
<ClInclude Include="$(zlibDir)\zutil.h" />
221+
<ClInclude Include="$(zlibIncludeDir)\crc32.h" />
222+
<ClInclude Include="$(zlibIncludeDir)\deflate.h" />
223+
<ClInclude Include="$(zlibIncludeDir)\inffast.h" />
224+
<ClInclude Include="$(zlibIncludeDir)\inffixed.h" />
225+
<ClInclude Include="$(zlibIncludeDir)\inflate.h" />
226+
<ClInclude Include="$(zlibIncludeDir)\inftrees.h" />
227+
<ClInclude Include="$(zlibIncludeDir)\trees.h" />
228+
<ClInclude Include="$(zlibIncludeDir)\zconf.h" />
229+
<ClInclude Include="$(zlibIncludeDir)\zconf.in.h" />
230+
<ClInclude Include="$(zlibIncludeDir)\zlib.h" />
231+
<ClInclude Include="$(zlibIncludeDir)\zutil.h" />
229232
</ItemGroup>
230233
<ItemGroup>
231234
<ClCompile Include="..\Modules\_abc.c" />
@@ -296,6 +299,7 @@
296299
<ClCompile Include="..\Modules\cjkcodecs\_codecs_tw.c" />
297300
<ClCompile Include="..\Modules\cjkcodecs\multibytecodec.c" />
298301
<ClCompile Include="..\Modules\_winapi.c" />
302+
<ClCompile Include="..\Modules\zlibmodule.c" />
299303
<ClCompile Include="..\Objects\abstract.c" />
300304
<ClCompile Include="..\Objects\accu.c" />
301305
<ClCompile Include="..\Objects\boolobject.c" />
@@ -407,20 +411,6 @@
407411
<ClCompile Include="..\Python\thread.c" />
408412
<ClCompile Include="..\Python\traceback.c" />
409413
</ItemGroup>
410-
<ItemGroup Condition="$(IncludeExternals)">
411-
<ClCompile Include="..\Modules\zlibmodule.c" />
412-
<ClCompile Include="$(zlibDir)\adler32.c" />
413-
<ClCompile Include="$(zlibDir)\compress.c" />
414-
<ClCompile Include="$(zlibDir)\crc32.c" />
415-
<ClCompile Include="$(zlibDir)\deflate.c" />
416-
<ClCompile Include="$(zlibDir)\infback.c" />
417-
<ClCompile Include="$(zlibDir)\inffast.c" />
418-
<ClCompile Include="$(zlibDir)\inflate.c" />
419-
<ClCompile Include="$(zlibDir)\inftrees.c" />
420-
<ClCompile Include="$(zlibDir)\trees.c" />
421-
<ClCompile Include="$(zlibDir)\uncompr.c" />
422-
<ClCompile Include="$(zlibDir)\zutil.c" />
423-
</ItemGroup>
424414
<ItemGroup>
425415
<ClCompile Include="..\PC\dl_nt.c" />
426416
</ItemGroup>

‎PCbuild/pythoncore.vcxproj.filters‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,6 +1052,7 @@
10521052
<ClCompile Include="$(zlibDir)\zutil.c">
10531053
<Filter>Modules\zlib</Filter>
10541054
</ClCompile>
1055+
<ClCompile Include="..\Modules\zlibmodule.c" />
10551056
</ItemGroup>
10561057
<ItemGroup>
10571058
<ResourceCompile Include="..\PC\python_nt.rc">

0 commit comments

Comments
 (0)