Skip to content

GH-132983: Build _zstd on Windows #133366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AA-Turner merged 7 commits into from
May 5, 2025
Merged

GH-132983: Build _zstd on Windows #133366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2563adf
Sorting
AA-Turner May 4, 2025
93c78cc
Add Zstandard projects
AA-Turner May 4, 2025
a0cfc5d
Zstandard scaffold
AA-Turner May 4, 2025
b9208b6
Add dependency of _zstd to python
AA-Turner May 5, 2025
755919f
Combine zstd.vcxproj into _zstd.vcxproj
AA-Turner May 5, 2025
17149df
Rename `Modules\zdict.c` to `zstddict.c`
AA-Turner May 5, 2025
1ae3a76
Point $(zstdDir) to the root
AA-Turner May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Combine zstd.vcxproj into _zstd.vcxproj
  • Loading branch information
@AA-Turner
AA-Turner committed May 5, 2025
commit 755919f1872f0882fc351f7f39924e2383f0ba8e
62 changes: 56 additions & 6 deletions PCbuild/_zstd.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{07029b86-f3e9-443e-86fb-78aa6d47fed1}</ProjectGuid>
<RootNamespace>zstd</RootNamespace>
<RootNamespace>_zstd</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="python.props" />
Expand All @@ -94,18 +94,72 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(zstdDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;ZSTD_MULTITHREAD=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(zstdDir);$(zstdDir)common;$(zstdDir)compress;$(zstdDir)decompress;$(zstdDir)dictBuilder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_zstd\_zstdmodule.c" />
<ClCompile Include="..\Modules\_zstd\compressor.c" />
<ClCompile Include="..\Modules\_zstd\decompressor.c" />
<ClCompile Include="..\Modules\_zstd\zdict.c" />
<ClCompile Include="$(zstdDir)common\debug.c" />
<ClCompile Include="$(zstdDir)common\entropy_common.c" />
<ClCompile Include="$(zstdDir)common\error_private.c" />
<ClCompile Include="$(zstdDir)common\fse_decompress.c" />
<ClCompile Include="$(zstdDir)common\pool.c" />
<ClCompile Include="$(zstdDir)common\threading.c" />
<ClCompile Include="$(zstdDir)common\xxhash.c" />
<ClCompile Include="$(zstdDir)common\zstd_common.c" />
<ClCompile Include="$(zstdDir)compress\fse_compress.c" />
<ClCompile Include="$(zstdDir)compress\hist.c" />
<ClCompile Include="$(zstdDir)compress\huf_compress.c" />
<ClCompile Include="$(zstdDir)compress\zstd_compress.c" />
<ClCompile Include="$(zstdDir)compress\zstd_compress_literals.c" />
<ClCompile Include="$(zstdDir)compress\zstd_compress_sequences.c" />
<ClCompile Include="$(zstdDir)compress\zstd_compress_superblock.c" />
<ClCompile Include="$(zstdDir)compress\zstd_double_fast.c" />
<ClCompile Include="$(zstdDir)compress\zstd_fast.c" />
<ClCompile Include="$(zstdDir)compress\zstd_lazy.c" />
<ClCompile Include="$(zstdDir)compress\zstd_ldm.c" />
<ClCompile Include="$(zstdDir)compress\zstd_opt.c" />
<ClCompile Include="$(zstdDir)compress\zstd_preSplit.c" />
<ClCompile Include="$(zstdDir)compress\zstdmt_compress.c" />
<ClCompile Include="$(zstdDir)decompress\huf_decompress.c" />
<ClCompile Include="$(zstdDir)decompress\zstd_ddict.c" />
<ClCompile Include="$(zstdDir)decompress\zstd_decompress.c" />
<ClCompile Include="$(zstdDir)decompress\zstd_decompress_block.c" />
<ClCompile Include="$(zstdDir)dictBuilder\cover.c" />
<ClCompile Include="$(zstdDir)dictBuilder\divsufsort.c" />
<ClCompile Include="$(zstdDir)dictBuilder\fastcover.c" />
<ClCompile Include="$(zstdDir)dictBuilder\zdict.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\_zstd\_zstdmodule.h" />
<ClInclude Include="..\Modules\_zstd\buffer.h" />
<ClInclude Include="$(zstdDir)common\bitstream.h" />
<ClInclude Include="$(zstdDir)common\error_private.h" />
<ClInclude Include="$(zstdDir)common\fse.h" />
<ClInclude Include="$(zstdDir)common\huf.h" />
<ClInclude Include="$(zstdDir)common\mem.h" />
<ClInclude Include="$(zstdDir)common\pool.h" />
<ClInclude Include="$(zstdDir)common\threading.h" />
<ClInclude Include="$(zstdDir)common\xxhash.h" />
<ClInclude Include="$(zstdDir)common\zstd_internal.h" />
<ClInclude Include="$(zstdDir)compress\zstd_compress.h" />
<ClInclude Include="$(zstdDir)compress\zstd_compress_literals.h" />
<ClInclude Include="$(zstdDir)compress\zstd_compress_sequences.h" />
<ClInclude Include="$(zstdDir)compress\zstd_compress_superblock.h" />
<ClInclude Include="$(zstdDir)compress\zstd_cwksp.h" />
<ClInclude Include="$(zstdDir)compress\zstd_double_fast.h" />
<ClInclude Include="$(zstdDir)compress\zstd_fast.h" />
<ClInclude Include="$(zstdDir)compress\zstd_lazy.h" />
<ClInclude Include="$(zstdDir)compress\zstd_ldm.h" />
<ClInclude Include="$(zstdDir)compress\zstd_opt.h" />
<ClInclude Include="$(zstdDir)compress\zstdmt_compress.h" />
<ClInclude Include="$(zstdDir)decompress\zstd_ddict.h" />
<ClInclude Include="$(zstdDir)zstd.h" />
<ClInclude Include="$(zstdDir)zstd_errors.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc" />
Expand All @@ -115,10 +169,6 @@
<Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="zstd.vcxproj">
<Project>{8d80e018-6a7d-4b46-a7be-d9e02a20d473}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
165 changes: 165 additions & 0 deletions PCbuild/_zstd.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\zstd">
<UniqueIdentifier>{971714e1-ff37-4240-87bf-a36f6afe764f}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\zstd">
<UniqueIdentifier>{deb43fb6-fa77-4c93-a333-85785fe5f68d}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\Modules\_zstd\_zstdmodule.c">
Expand All @@ -24,6 +30,96 @@
<ClCompile Include="..\Modules\_zstd\zdict.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)common\debug.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)common\entropy_common.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)common\error_private.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)common\fse_decompress.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)common\pool.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)common\threading.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)common\xxhash.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)common\zstd_common.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)compress\fse_compress.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)compress\hist.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)compress\huf_compress.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)compress\zstd_compress.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)compress\zstd_compress_literals.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)compress\zstd_compress_sequences.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)compress\zstd_compress_superblock.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)compress\zstd_double_fast.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)compress\zstd_fast.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)compress\zstd_lazy.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)compress\zstd_ldm.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)compress\zstd_opt.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)compress\zstd_preSplit.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)compress\zstdmt_compress.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)decompress\huf_decompress.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)decompress\zstd_ddict.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)decompress\zstd_decompress.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)decompress\zstd_decompress_block.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)dictBuilder\cover.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)dictBuilder\divsufsort.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)dictBuilder\fastcover.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
<ClCompile Include="$(zstdDir)dictBuilder\zdict.c">
<Filter>Source Files\zstd</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Modules\_zstd\_zstdmodule.h">
Expand All @@ -32,6 +128,75 @@
<ClInclude Include="..\Modules\_zstd\buffer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)zstd.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)zstd_errors.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)common\bitstream.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)common\error_private.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)common\fse.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)common\huf.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)common\mem.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)common\pool.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)common\threading.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)common\xxhash.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)common\zstd_internal.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)compress\zstd_compress.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)compress\zstd_compress_literals.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)compress\zstd_compress_sequences.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)compress\zstd_compress_superblock.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)compress\zstd_cwksp.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)compress\zstd_double_fast.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)compress\zstd_fast.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)compress\zstd_lazy.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)compress\zstd_ldm.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)compress\zstd_opt.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)compress\zstdmt_compress.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
<ClInclude Include="$(zstdDir)decompress\zstd_ddict.h">
<Filter>Header Files\zstd</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\PC\python_nt.rc">
Expand Down
34 changes: 0 additions & 34 deletions PCbuild/pcbuild.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_remotedebugging", "_remote
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_zstd", "_zstd.vcxproj", "{07029B86-F3E9-443E-86FB-78AA6D47FED1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstd", "zstd.vcxproj", "{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Expand Down Expand Up @@ -1787,38 +1785,6 @@ Global
{07029B86-F3E9-443E-86FB-78AA6D47FED1}.Release|Win32.Build.0 = Release|Win32
{07029B86-F3E9-443E-86FB-78AA6D47FED1}.Release|x64.ActiveCfg = Release|x64
{07029B86-F3E9-443E-86FB-78AA6D47FED1}.Release|x64.Build.0 = Release|x64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|ARM.ActiveCfg = Debug|ARM
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|ARM.Build.0 = Debug|ARM
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|ARM64.ActiveCfg = Debug|ARM64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|ARM64.Build.0 = Debug|ARM64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|Win32.ActiveCfg = Debug|Win32
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|Win32.Build.0 = Debug|Win32
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|x64.ActiveCfg = Debug|x64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|x64.Build.0 = Debug|x64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|ARM.ActiveCfg = PGInstrument|ARM
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|ARM.Build.0 = PGInstrument|ARM
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|ARM64.ActiveCfg = PGInstrument|ARM64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|ARM64.Build.0 = PGInstrument|ARM64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|x64.Build.0 = PGInstrument|x64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|ARM.ActiveCfg = PGUpdate|ARM
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|ARM.Build.0 = PGUpdate|ARM
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|ARM64.ActiveCfg = PGUpdate|ARM64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|ARM64.Build.0 = PGUpdate|ARM64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|x64.Build.0 = PGUpdate|x64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|ARM.ActiveCfg = Release|ARM
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|ARM.Build.0 = Release|ARM
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|ARM64.ActiveCfg = Release|ARM64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|ARM64.Build.0 = Release|ARM64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|Win32.ActiveCfg = Release|Win32
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|Win32.Build.0 = Release|Win32
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|x64.ActiveCfg = Release|x64
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading