Skip to content

Commit 755919f

Browse files
AA-TurnerAA-Turner
committed
Combine zstd.vcxproj into _zstd.vcxproj
1 parent b9208b6 commit 755919f

File tree

5 files changed

+221
-372
lines changed

5 files changed

+221
-372
lines changed

‎PCbuild/_zstd.vcxproj‎

Lines changed: 56 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
</ItemGroup>
6969
<PropertyGroup Label="Globals">
7070
<ProjectGuid>{07029b86-f3e9-443e-86fb-78aa6d47fed1}</ProjectGuid>
71-
<RootNamespace>zstd</RootNamespace>
71+
<RootNamespace>_zstd</RootNamespace>
7272
<Keyword>Win32Proj</Keyword>
7373
</PropertyGroup>
7474
<Import Project="python.props" />
@@ -94,18 +94,72 @@
9494
</PropertyGroup>
9595
<ItemDefinitionGroup>
9696
<ClCompile>
97-
<AdditionalIncludeDirectories>$(zstdDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
97+
<PreprocessorDefinitions>WIN32;ZSTD_MULTITHREAD=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
98+
<AdditionalIncludeDirectories>$(zstdDir);$(zstdDir)common;$(zstdDir)compress;$(zstdDir)decompress;$(zstdDir)dictBuilder;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9899
</ClCompile>
99100
</ItemDefinitionGroup>
100101
<ItemGroup>
101102
<ClCompile Include="..\Modules\_zstd\_zstdmodule.c" />
102103
<ClCompile Include="..\Modules\_zstd\compressor.c" />
103104
<ClCompile Include="..\Modules\_zstd\decompressor.c" />
104105
<ClCompile Include="..\Modules\_zstd\zdict.c" />
106+
<ClCompile Include="$(zstdDir)common\debug.c" />
107+
<ClCompile Include="$(zstdDir)common\entropy_common.c" />
108+
<ClCompile Include="$(zstdDir)common\error_private.c" />
109+
<ClCompile Include="$(zstdDir)common\fse_decompress.c" />
110+
<ClCompile Include="$(zstdDir)common\pool.c" />
111+
<ClCompile Include="$(zstdDir)common\threading.c" />
112+
<ClCompile Include="$(zstdDir)common\xxhash.c" />
113+
<ClCompile Include="$(zstdDir)common\zstd_common.c" />
114+
<ClCompile Include="$(zstdDir)compress\fse_compress.c" />
115+
<ClCompile Include="$(zstdDir)compress\hist.c" />
116+
<ClCompile Include="$(zstdDir)compress\huf_compress.c" />
117+
<ClCompile Include="$(zstdDir)compress\zstd_compress.c" />
118+
<ClCompile Include="$(zstdDir)compress\zstd_compress_literals.c" />
119+
<ClCompile Include="$(zstdDir)compress\zstd_compress_sequences.c" />
120+
<ClCompile Include="$(zstdDir)compress\zstd_compress_superblock.c" />
121+
<ClCompile Include="$(zstdDir)compress\zstd_double_fast.c" />
122+
<ClCompile Include="$(zstdDir)compress\zstd_fast.c" />
123+
<ClCompile Include="$(zstdDir)compress\zstd_lazy.c" />
124+
<ClCompile Include="$(zstdDir)compress\zstd_ldm.c" />
125+
<ClCompile Include="$(zstdDir)compress\zstd_opt.c" />
126+
<ClCompile Include="$(zstdDir)compress\zstd_preSplit.c" />
127+
<ClCompile Include="$(zstdDir)compress\zstdmt_compress.c" />
128+
<ClCompile Include="$(zstdDir)decompress\huf_decompress.c" />
129+
<ClCompile Include="$(zstdDir)decompress\zstd_ddict.c" />
130+
<ClCompile Include="$(zstdDir)decompress\zstd_decompress.c" />
131+
<ClCompile Include="$(zstdDir)decompress\zstd_decompress_block.c" />
132+
<ClCompile Include="$(zstdDir)dictBuilder\cover.c" />
133+
<ClCompile Include="$(zstdDir)dictBuilder\divsufsort.c" />
134+
<ClCompile Include="$(zstdDir)dictBuilder\fastcover.c" />
135+
<ClCompile Include="$(zstdDir)dictBuilder\zdict.c" />
105136
</ItemGroup>
106137
<ItemGroup>
107138
<ClInclude Include="..\Modules\_zstd\_zstdmodule.h" />
108139
<ClInclude Include="..\Modules\_zstd\buffer.h" />
140+
<ClInclude Include="$(zstdDir)common\bitstream.h" />
141+
<ClInclude Include="$(zstdDir)common\error_private.h" />
142+
<ClInclude Include="$(zstdDir)common\fse.h" />
143+
<ClInclude Include="$(zstdDir)common\huf.h" />
144+
<ClInclude Include="$(zstdDir)common\mem.h" />
145+
<ClInclude Include="$(zstdDir)common\pool.h" />
146+
<ClInclude Include="$(zstdDir)common\threading.h" />
147+
<ClInclude Include="$(zstdDir)common\xxhash.h" />
148+
<ClInclude Include="$(zstdDir)common\zstd_internal.h" />
149+
<ClInclude Include="$(zstdDir)compress\zstd_compress.h" />
150+
<ClInclude Include="$(zstdDir)compress\zstd_compress_literals.h" />
151+
<ClInclude Include="$(zstdDir)compress\zstd_compress_sequences.h" />
152+
<ClInclude Include="$(zstdDir)compress\zstd_compress_superblock.h" />
153+
<ClInclude Include="$(zstdDir)compress\zstd_cwksp.h" />
154+
<ClInclude Include="$(zstdDir)compress\zstd_double_fast.h" />
155+
<ClInclude Include="$(zstdDir)compress\zstd_fast.h" />
156+
<ClInclude Include="$(zstdDir)compress\zstd_lazy.h" />
157+
<ClInclude Include="$(zstdDir)compress\zstd_ldm.h" />
158+
<ClInclude Include="$(zstdDir)compress\zstd_opt.h" />
159+
<ClInclude Include="$(zstdDir)compress\zstdmt_compress.h" />
160+
<ClInclude Include="$(zstdDir)decompress\zstd_ddict.h" />
161+
<ClInclude Include="$(zstdDir)zstd.h" />
162+
<ClInclude Include="$(zstdDir)zstd_errors.h" />
109163
</ItemGroup>
110164
<ItemGroup>
111165
<ResourceCompile Include="..\PC\python_nt.rc" />
@@ -115,10 +169,6 @@
115169
<Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
116170
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
117171
</ProjectReference>
118-
<ProjectReference Include="zstd.vcxproj">
119-
<Project>{8d80e018-6a7d-4b46-a7be-d9e02a20d473}</Project>
120-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
121-
</ProjectReference>
122172
</ItemGroup>
123173
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
124174
<ImportGroup Label="ExtensionTargets">

‎PCbuild/_zstd.vcxproj.filters‎

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
<Filter Include="Resource Files">
1111
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
1212
</Filter>
13+
<Filter Include="Header Files\zstd">
14+
<UniqueIdentifier>{971714e1-ff37-4240-87bf-a36f6afe764f}</UniqueIdentifier>
15+
</Filter>
16+
<Filter Include="Source Files\zstd">
17+
<UniqueIdentifier>{deb43fb6-fa77-4c93-a333-85785fe5f68d}</UniqueIdentifier>
18+
</Filter>
1319
</ItemGroup>
1420
<ItemGroup>
1521
<ClCompile Include="..\Modules\_zstd\_zstdmodule.c">
@@ -24,6 +30,96 @@
2430
<ClCompile Include="..\Modules\_zstd\zdict.c">
2531
<Filter>Source Files</Filter>
2632
</ClCompile>
33+
<ClCompile Include="$(zstdDir)common\debug.c">
34+
<Filter>Source Files\zstd</Filter>
35+
</ClCompile>
36+
<ClCompile Include="$(zstdDir)common\entropy_common.c">
37+
<Filter>Source Files\zstd</Filter>
38+
</ClCompile>
39+
<ClCompile Include="$(zstdDir)common\error_private.c">
40+
<Filter>Source Files\zstd</Filter>
41+
</ClCompile>
42+
<ClCompile Include="$(zstdDir)common\fse_decompress.c">
43+
<Filter>Source Files\zstd</Filter>
44+
</ClCompile>
45+
<ClCompile Include="$(zstdDir)common\pool.c">
46+
<Filter>Source Files\zstd</Filter>
47+
</ClCompile>
48+
<ClCompile Include="$(zstdDir)common\threading.c">
49+
<Filter>Source Files\zstd</Filter>
50+
</ClCompile>
51+
<ClCompile Include="$(zstdDir)common\xxhash.c">
52+
<Filter>Source Files\zstd</Filter>
53+
</ClCompile>
54+
<ClCompile Include="$(zstdDir)common\zstd_common.c">
55+
<Filter>Source Files\zstd</Filter>
56+
</ClCompile>
57+
<ClCompile Include="$(zstdDir)compress\fse_compress.c">
58+
<Filter>Source Files\zstd</Filter>
59+
</ClCompile>
60+
<ClCompile Include="$(zstdDir)compress\hist.c">
61+
<Filter>Source Files\zstd</Filter>
62+
</ClCompile>
63+
<ClCompile Include="$(zstdDir)compress\huf_compress.c">
64+
<Filter>Source Files\zstd</Filter>
65+
</ClCompile>
66+
<ClCompile Include="$(zstdDir)compress\zstd_compress.c">
67+
<Filter>Source Files\zstd</Filter>
68+
</ClCompile>
69+
<ClCompile Include="$(zstdDir)compress\zstd_compress_literals.c">
70+
<Filter>Source Files\zstd</Filter>
71+
</ClCompile>
72+
<ClCompile Include="$(zstdDir)compress\zstd_compress_sequences.c">
73+
<Filter>Source Files\zstd</Filter>
74+
</ClCompile>
75+
<ClCompile Include="$(zstdDir)compress\zstd_compress_superblock.c">
76+
<Filter>Source Files\zstd</Filter>
77+
</ClCompile>
78+
<ClCompile Include="$(zstdDir)compress\zstd_double_fast.c">
79+
<Filter>Source Files\zstd</Filter>
80+
</ClCompile>
81+
<ClCompile Include="$(zstdDir)compress\zstd_fast.c">
82+
<Filter>Source Files\zstd</Filter>
83+
</ClCompile>
84+
<ClCompile Include="$(zstdDir)compress\zstd_lazy.c">
85+
<Filter>Source Files\zstd</Filter>
86+
</ClCompile>
87+
<ClCompile Include="$(zstdDir)compress\zstd_ldm.c">
88+
<Filter>Source Files\zstd</Filter>
89+
</ClCompile>
90+
<ClCompile Include="$(zstdDir)compress\zstd_opt.c">
91+
<Filter>Source Files\zstd</Filter>
92+
</ClCompile>
93+
<ClCompile Include="$(zstdDir)compress\zstd_preSplit.c">
94+
<Filter>Source Files\zstd</Filter>
95+
</ClCompile>
96+
<ClCompile Include="$(zstdDir)compress\zstdmt_compress.c">
97+
<Filter>Source Files\zstd</Filter>
98+
</ClCompile>
99+
<ClCompile Include="$(zstdDir)decompress\huf_decompress.c">
100+
<Filter>Source Files\zstd</Filter>
101+
</ClCompile>
102+
<ClCompile Include="$(zstdDir)decompress\zstd_ddict.c">
103+
<Filter>Source Files\zstd</Filter>
104+
</ClCompile>
105+
<ClCompile Include="$(zstdDir)decompress\zstd_decompress.c">
106+
<Filter>Source Files\zstd</Filter>
107+
</ClCompile>
108+
<ClCompile Include="$(zstdDir)decompress\zstd_decompress_block.c">
109+
<Filter>Source Files\zstd</Filter>
110+
</ClCompile>
111+
<ClCompile Include="$(zstdDir)dictBuilder\cover.c">
112+
<Filter>Source Files\zstd</Filter>
113+
</ClCompile>
114+
<ClCompile Include="$(zstdDir)dictBuilder\divsufsort.c">
115+
<Filter>Source Files\zstd</Filter>
116+
</ClCompile>
117+
<ClCompile Include="$(zstdDir)dictBuilder\fastcover.c">
118+
<Filter>Source Files\zstd</Filter>
119+
</ClCompile>
120+
<ClCompile Include="$(zstdDir)dictBuilder\zdict.c">
121+
<Filter>Source Files\zstd</Filter>
122+
</ClCompile>
27123
</ItemGroup>
28124
<ItemGroup>
29125
<ClInclude Include="..\Modules\_zstd\_zstdmodule.h">
@@ -32,6 +128,75 @@
32128
<ClInclude Include="..\Modules\_zstd\buffer.h">
33129
<Filter>Header Files</Filter>
34130
</ClInclude>
131+
<ClInclude Include="$(zstdDir)zstd.h">
132+
<Filter>Header Files\zstd</Filter>
133+
</ClInclude>
134+
<ClInclude Include="$(zstdDir)zstd_errors.h">
135+
<Filter>Header Files\zstd</Filter>
136+
</ClInclude>
137+
<ClInclude Include="$(zstdDir)common\bitstream.h">
138+
<Filter>Header Files\zstd</Filter>
139+
</ClInclude>
140+
<ClInclude Include="$(zstdDir)common\error_private.h">
141+
<Filter>Header Files\zstd</Filter>
142+
</ClInclude>
143+
<ClInclude Include="$(zstdDir)common\fse.h">
144+
<Filter>Header Files\zstd</Filter>
145+
</ClInclude>
146+
<ClInclude Include="$(zstdDir)common\huf.h">
147+
<Filter>Header Files\zstd</Filter>
148+
</ClInclude>
149+
<ClInclude Include="$(zstdDir)common\mem.h">
150+
<Filter>Header Files\zstd</Filter>
151+
</ClInclude>
152+
<ClInclude Include="$(zstdDir)common\pool.h">
153+
<Filter>Header Files\zstd</Filter>
154+
</ClInclude>
155+
<ClInclude Include="$(zstdDir)common\threading.h">
156+
<Filter>Header Files\zstd</Filter>
157+
</ClInclude>
158+
<ClInclude Include="$(zstdDir)common\xxhash.h">
159+
<Filter>Header Files\zstd</Filter>
160+
</ClInclude>
161+
<ClInclude Include="$(zstdDir)common\zstd_internal.h">
162+
<Filter>Header Files\zstd</Filter>
163+
</ClInclude>
164+
<ClInclude Include="$(zstdDir)compress\zstd_compress.h">
165+
<Filter>Header Files\zstd</Filter>
166+
</ClInclude>
167+
<ClInclude Include="$(zstdDir)compress\zstd_compress_literals.h">
168+
<Filter>Header Files\zstd</Filter>
169+
</ClInclude>
170+
<ClInclude Include="$(zstdDir)compress\zstd_compress_sequences.h">
171+
<Filter>Header Files\zstd</Filter>
172+
</ClInclude>
173+
<ClInclude Include="$(zstdDir)compress\zstd_compress_superblock.h">
174+
<Filter>Header Files\zstd</Filter>
175+
</ClInclude>
176+
<ClInclude Include="$(zstdDir)compress\zstd_cwksp.h">
177+
<Filter>Header Files\zstd</Filter>
178+
</ClInclude>
179+
<ClInclude Include="$(zstdDir)compress\zstd_double_fast.h">
180+
<Filter>Header Files\zstd</Filter>
181+
</ClInclude>
182+
<ClInclude Include="$(zstdDir)compress\zstd_fast.h">
183+
<Filter>Header Files\zstd</Filter>
184+
</ClInclude>
185+
<ClInclude Include="$(zstdDir)compress\zstd_lazy.h">
186+
<Filter>Header Files\zstd</Filter>
187+
</ClInclude>
188+
<ClInclude Include="$(zstdDir)compress\zstd_ldm.h">
189+
<Filter>Header Files\zstd</Filter>
190+
</ClInclude>
191+
<ClInclude Include="$(zstdDir)compress\zstd_opt.h">
192+
<Filter>Header Files\zstd</Filter>
193+
</ClInclude>
194+
<ClInclude Include="$(zstdDir)compress\zstdmt_compress.h">
195+
<Filter>Header Files\zstd</Filter>
196+
</ClInclude>
197+
<ClInclude Include="$(zstdDir)decompress\zstd_ddict.h">
198+
<Filter>Header Files\zstd</Filter>
199+
</ClInclude>
35200
</ItemGroup>
36201
<ItemGroup>
37202
<ResourceCompile Include="..\PC\python_nt.rc">

‎PCbuild/pcbuild.sln‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_remotedebugging", "_remote
168168
EndProject
169169
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_zstd", "_zstd.vcxproj", "{07029B86-F3E9-443E-86FB-78AA6D47FED1}"
170170
EndProject
171-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstd", "zstd.vcxproj", "{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}"
172-
EndProject
173171
Global
174172
GlobalSection(SolutionConfigurationPlatforms) = preSolution
175173
Debug|ARM = Debug|ARM
@@ -1787,38 +1785,6 @@ Global
17871785
{07029B86-F3E9-443E-86FB-78AA6D47FED1}.Release|Win32.Build.0 = Release|Win32
17881786
{07029B86-F3E9-443E-86FB-78AA6D47FED1}.Release|x64.ActiveCfg = Release|x64
17891787
{07029B86-F3E9-443E-86FB-78AA6D47FED1}.Release|x64.Build.0 = Release|x64
1790-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|ARM.ActiveCfg = Debug|ARM
1791-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|ARM.Build.0 = Debug|ARM
1792-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|ARM64.ActiveCfg = Debug|ARM64
1793-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|ARM64.Build.0 = Debug|ARM64
1794-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|Win32.ActiveCfg = Debug|Win32
1795-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|Win32.Build.0 = Debug|Win32
1796-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|x64.ActiveCfg = Debug|x64
1797-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Debug|x64.Build.0 = Debug|x64
1798-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|ARM.ActiveCfg = PGInstrument|ARM
1799-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|ARM.Build.0 = PGInstrument|ARM
1800-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|ARM64.ActiveCfg = PGInstrument|ARM64
1801-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|ARM64.Build.0 = PGInstrument|ARM64
1802-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
1803-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
1804-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
1805-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGInstrument|x64.Build.0 = PGInstrument|x64
1806-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|ARM.ActiveCfg = PGUpdate|ARM
1807-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|ARM.Build.0 = PGUpdate|ARM
1808-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|ARM64.ActiveCfg = PGUpdate|ARM64
1809-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|ARM64.Build.0 = PGUpdate|ARM64
1810-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
1811-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
1812-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
1813-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.PGUpdate|x64.Build.0 = PGUpdate|x64
1814-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|ARM.ActiveCfg = Release|ARM
1815-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|ARM.Build.0 = Release|ARM
1816-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|ARM64.ActiveCfg = Release|ARM64
1817-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|ARM64.Build.0 = Release|ARM64
1818-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|Win32.ActiveCfg = Release|Win32
1819-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|Win32.Build.0 = Release|Win32
1820-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|x64.ActiveCfg = Release|x64
1821-
{8D80E018-6A7D-4B46-A7BE-D9E02A20D473}.Release|x64.Build.0 = Release|x64
18221788
EndGlobalSection
18231789
GlobalSection(SolutionProperties) = preSolution
18241790
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)