From 19e6cbb71ce911498ab4dd6c235195562314bcef Mon Sep 17 00:00:00 2001
From: Ian Fitchet <ifitchet@anaconda.com>
Date: Mon, 30 Jun 2025 11:20:05 +0100
Subject: [PATCH 23/24] Unvendor zlib-ng

---
 PCbuild/pcbuild.proj            |   2 +-
 PCbuild/zlib-ng.vcxproj         | 122 +----------------
 PCbuild/zlib-ng.vcxproj.filters | 228 --------------------------------
 3 files changed, 2 insertions(+), 350 deletions(-)

diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj
index 7a5327bf016..cde688ef534 100644
--- a/PCbuild/pcbuild.proj
+++ b/PCbuild/pcbuild.proj
@@ -48,7 +48,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <!-- Static libraries for use later in the build -->
-    <Projects Include="zlib-ng.vcxproj" Condition="$(zlibNgDir) != '' and Exists('$(zlibNgDir)\zlib-ng.h.in')" />
+    <Projects Include="zlib-ng.vcxproj" Condition="$(condaDir) != '' and Exists('$(condaDir)\include\zlib.h')" />
     <!-- pythonXY.dll -->
     <!--
     Parallel build is explicitly disabled for this project because it
diff --git a/PCbuild/zlib-ng.vcxproj b/PCbuild/zlib-ng.vcxproj
index de1698ae718..e3c9b16f6ef 100644
--- a/PCbuild/zlib-ng.vcxproj
+++ b/PCbuild/zlib-ng.vcxproj
@@ -73,9 +73,6 @@
   </PropertyGroup>
   <Import Project="python.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -94,7 +91,7 @@
       <DisableSpecificWarnings>4206;4054;4324</DisableSpecificWarnings>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>$(zlibNgDir);$(PySourceDir)PC;$(GeneratedZlibNgDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(condaDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);ZLIB_COMPAT;WITH_GZFILEOP;NO_FSEEKO;HAVE_BUILTIN_ASSUME_ALIGNED;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="$(Platform) == 'Win32' or $(Platform) == 'x64'">%(PreprocessorDefinitions);X86_FEATURES;X86_HAVE_XSAVE_INTRIN;X86_SSE2;X86_SSSE3;X86_SSE42;X86_PCLMULQDQ_CRC;X86_AVX2;X86_AVX512;X86_AVX512VNNI;X86_VPCLMULQDQ_CRC</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="$(Configuration) == 'Debug'">%(PreprocessorDefinitions);ZLIB_DEBUG</PreprocessorDefinitions>
@@ -102,132 +99,15 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(zlibNgDir)\arch\generic\adler32_c.c" />
-    <ClCompile Include="$(zlibNgDir)\arch\generic\adler32_fold_c.c" />
-    <ClCompile Include="$(zlibNgDir)\arch\generic\chunkset_c.c" />
-    <ClCompile Include="$(zlibNgDir)\arch\generic\compare256_c.c" />
-    <ClCompile Include="$(zlibNgDir)\arch\generic\crc32_braid_c.c" />
-    <ClCompile Include="$(zlibNgDir)\arch\generic\crc32_fold_c.c" />
-    <ClCompile Include="$(zlibNgDir)\arch\generic\slide_hash_c.c" />
-    <ClCompile Include="$(zlibNgDir)\adler32.c" />
-    <ClCompile Include="$(zlibNgDir)\compress.c" />
-    <ClCompile Include="$(zlibNgDir)\crc32.c" />
-    <ClCompile Include="$(zlibNgDir)\crc32_braid_comb.c" />
-    <ClCompile Include="$(zlibNgDir)\deflate.c" />
-    <ClCompile Include="$(zlibNgDir)\deflate_fast.c" />
-    <ClCompile Include="$(zlibNgDir)\deflate_huff.c" />
-    <ClCompile Include="$(zlibNgDir)\deflate_medium.c" />
-    <ClCompile Include="$(zlibNgDir)\deflate_quick.c" />
-    <ClCompile Include="$(zlibNgDir)\deflate_rle.c" />
-    <ClCompile Include="$(zlibNgDir)\deflate_slow.c" />
-    <ClCompile Include="$(zlibNgDir)\deflate_stored.c" />
-    <ClCompile Include="$(zlibNgDir)\functable.c" />
-    <ClCompile Include="$(zlibNgDir)\infback.c" />
-    <ClCompile Include="$(zlibNgDir)\inflate.c" />
-    <ClCompile Include="$(zlibNgDir)\inftrees.c" />
-    <ClCompile Include="$(zlibNgDir)\insert_string.c" />
-    <ClCompile Include="$(zlibNgDir)\insert_string_roll.c" />
-    <ClCompile Include="$(zlibNgDir)\trees.c" />
-    <ClCompile Include="$(zlibNgDir)\uncompr.c" />
-    <ClCompile Include="$(zlibNgDir)\zutil.c" />
-    <ClCompile Include="$(zlibNgDir)\cpu_features.c" />
-    <ClInclude Include="$(zlibNgDir)\arch\generic\generic_functions.h" />
-    <ClInclude Include="$(zlibNgDir)\fallback_builtins.h" />
   </ItemGroup>
   <ItemGroup Condition="$(Platform) == 'Win32' or $(Platform) == 'x64'">
-    <ClInclude Include="$(zlibNgDir)\arch\x86\x86_functions.h" />
-    <ClInclude Include="$(zlibNgDir)\arch\x86\x86_features.h" />
-    <ClInclude Include="$(zlibNgDir)\arch\x86\adler32_avx512_p.h" />
-    <ClCompile Include="$(zlibNgDir)\arch\x86\x86_features.c" />
-    <ClCompile Include="$(zlibNgDir)\arch\x86\chunkset_sse2.c" />
-    <ClCompile Include="$(zlibNgDir)\arch\x86\compare256_sse2.c" />
-    <ClCompile Include="$(zlibNgDir)\arch\x86\slide_hash_sse2.c" />
-    <ClCompile Include="$(zlibNgDir)\arch\x86\adler32_ssse3.c">
-      <AdditionalOptions Condition="$(PlatformToolset) == 'ClangCL'">%(AdditionalOptions) -mssse3</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\chunkset_ssse3.c">
-      <AdditionalOptions Condition="$(PlatformToolset) == 'ClangCL'">%(AdditionalOptions) -mssse3</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\adler32_sse42.c">
-      <AdditionalOptions Condition="$(PlatformToolset) == 'ClangCL'">%(AdditionalOptions) -msse4.2</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\crc32_pclmulqdq.c">
-      <AdditionalOptions Condition="$(PlatformToolset) == 'ClangCL'">%(AdditionalOptions) -mssse3 -mpclmul</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\slide_hash_avx2.c">
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\chunkset_avx2.c">
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\compare256_avx2.c">
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\adler32_avx2.c">
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\adler32_avx512.c">
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions512</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\chunkset_avx512.c">
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions512</EnableEnhancedInstructionSet>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\adler32_avx512_vnni.c">
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions512</EnableEnhancedInstructionSet>
-      <AdditionalOptions Condition="$(PlatformToolset) == 'ClangCL'">%(AdditionalOptions) -mavx512vnni</AdditionalOptions>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\crc32_vpclmulqdq.c">
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions512</EnableEnhancedInstructionSet>
-      <AdditionalOptions Condition="$(PlatformToolset) == 'ClangCL'">%(AdditionalOptions) -mvpclmulqdq</AdditionalOptions>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\PC\zconf.h" />
     <ClInclude Include="..\PC\zlib.h" />
-    <ClInclude Include="$(zlibNgDir)\arch\generic\chunk_permute_table.h" />
-    <ClInclude Include="$(zlibNgDir)\arch\generic\compare256_p.h" />
-    <ClInclude Include="$(zlibNgDir)\adler32_p.h" />
-    <ClInclude Include="$(zlibNgDir)\chunkset_tpl.h" />
-    <ClInclude Include="$(zlibNgDir)\compare256_rle.h" />
-    <ClInclude Include="$(zlibNgDir)\arch_functions.h" />
-    <ClInclude Include="$(zlibNgDir)\crc32_braid_p.h" />
-    <ClInclude Include="$(zlibNgDir)\crc32_braid_comb_p.h" />
-    <ClInclude Include="$(zlibNgDir)\crc32_braid_tbl.h" />
-    <ClInclude Include="$(zlibNgDir)\deflate.h" />
-    <ClInclude Include="$(zlibNgDir)\deflate_p.h" />
-    <ClInclude Include="$(zlibNgDir)\functable.h" />
-    <ClInclude Include="$(zlibNgDir)\inffast_tpl.h" />
-    <ClInclude Include="$(zlibNgDir)\inffixed_tbl.h" />
-    <ClInclude Include="$(zlibNgDir)\inflate.h" />
-    <ClInclude Include="$(zlibNgDir)\inflate_p.h" />
-    <ClInclude Include="$(zlibNgDir)\inftrees.h" />
-    <ClInclude Include="$(zlibNgDir)\insert_string_tpl.h" />
-    <ClInclude Include="$(zlibNgDir)\match_tpl.h" />
-    <ClInclude Include="$(zlibNgDir)\trees.h" />
-    <ClInclude Include="$(zlibNgDir)\trees_emit.h" />
-    <ClInclude Include="$(zlibNgDir)\trees_tbl.h" />
-    <ClInclude Include="$(zlibNgDir)\zbuild.h" />
-    <ClInclude Include="$(zlibNgDir)\zendian.h" />
-    <ClInclude Include="$(zlibNgDir)\zutil.h" />
-    <ClInclude Include="$(zlibNgDir)\cpu_features.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 
-  <Target Name="_EnsureZlibH" Inputs="$(zlibNgDir)\zlib.h.in" Outputs="$(IntDir)zlib.h">
-    <PropertyGroup>
-      <Text>$([System.IO.File]::ReadAllText('$(zlibNgDir)\zlib.h.in').Replace('@ZLIB_SYMBOL_PREFIX@', ''))</Text>
-    </PropertyGroup>
-    <WriteLinesToFile File="$(IntDir)zlib.h" Lines="$(Text)" />
-  </Target>
-  <Target Name="_EnsureZlibNgH" Inputs="$(zlibNgDir)\zlib-ng.h.in" Outputs="$(IntDir)zlib-ng.h">
-    <PropertyGroup>
-      <Text>$([System.IO.File]::ReadAllText('$(zlibNgDir)\zlib-ng.h.in').Replace('@ZLIB_SYMBOL_PREFIX@', ''))</Text>
-    </PropertyGroup>
-    <WriteLinesToFile File="$(IntDir)zlib-ng.h" Lines="$(Text)" />
-  </Target>
-
-  <Target Name="_EnsureZlibNgHeaders" BeforeTargets="PrepareForBuild"
-          DependsOnTargets="_EnsureZlibH;_EnsureZlibNgH" />
 </Project>
diff --git a/PCbuild/zlib-ng.vcxproj.filters b/PCbuild/zlib-ng.vcxproj.filters
index addbd45f880..0280369b001 100644
--- a/PCbuild/zlib-ng.vcxproj.filters
+++ b/PCbuild/zlib-ng.vcxproj.filters
@@ -1,242 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="$(zlibNgDir)\adler32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\adler32_avx2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\adler32_avx512.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\adler32_avx512_vnni.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\generic\adler32_c.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\generic\adler32_fold_c.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\adler32_sse42.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\adler32_ssse3.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\chunkset_avx2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\chunkset_avx512.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\generic\chunkset_c.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\chunkset_sse2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\chunkset_ssse3.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\compare256_avx2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\generic\compare256_c.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\compare256_sse2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\compress.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\cpu_features.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\crc32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\generic\crc32_braid_c.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\crc32_braid_comb.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\generic\crc32_fold_c.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\crc32_pclmulqdq.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\crc32_vpclmulqdq.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\deflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\deflate_fast.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\deflate_huff.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\deflate_medium.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\deflate_quick.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\deflate_rle.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\deflate_slow.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\deflate_stored.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\functable.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\infback.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\inflate.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\inftrees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\insert_string.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\insert_string_roll.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\slide_hash_avx2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\generic\slide_hash_c.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\slide_hash_sse2.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\trees.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\uncompr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\arch\x86\x86_features.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(zlibNgDir)\zutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(zlibNgDir)\arch\x86\adler32_avx512_p.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\adler32_p.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\arch_functions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\arch\generic\chunk_permute_table.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\chunkset_tpl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\arch\generic\compare256_p.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\compare256_rle.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\cpu_features.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\crc32_braid_comb_p.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\crc32_braid_p.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\crc32_braid_tbl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\deflate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\deflate_p.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\fallback_builtins.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\functable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\arch\generic\generic_functions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\inffast_tpl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\inffixed_tbl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\inflate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\inflate_p.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\inftrees.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\insert_string_tpl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\match_tpl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\trees.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\trees_emit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\trees_tbl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\arch\x86\x86_features.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\arch\x86\x86_functions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\zbuild.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\PC\zconf.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\zendian.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\PC\zlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="$(zlibNgDir)\zutil.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
-- 
2.50.1 (Apple Git-155)