Skip to content

Commit 08eecb1

Browse files
committed
Exclude Intel optimizations better on ARM64
1 parent 89d44a1 commit 08eecb1

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

PCbuild/zlib-ng.vcxproj

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,10 @@
9494
<LanguageStandard_C>stdc11</LanguageStandard_C>
9595
<PrecompiledHeader>NotUsing</PrecompiledHeader>
9696
<AdditionalIncludeDirectories>$(zlibNgDir);$(PySourceDir)PC;$(GeneratedZlibNgDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
97-
<PreprocessorDefinitions>%(PreprocessorDefinitions);ZLIB_COMPAT;WITH_GZFILEOP;NO_FSEEKO;HAVE_BUILTIN_ASSUME_ALIGNED;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;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>
97+
<PreprocessorDefinitions>%(PreprocessorDefinitions);ZLIB_COMPAT;WITH_GZFILEOP;NO_FSEEKO;HAVE_BUILTIN_ASSUME_ALIGNED;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;</PreprocessorDefinitions>
98+
<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>
9899
<PreprocessorDefinitions Condition="$(Configuration) == 'Debug'">%(PreprocessorDefinitions);ZLIB_DEBUG</PreprocessorDefinitions>
99-
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
100+
<EnableEnhancedInstructionSet Condition="$(Platform) == 'Win32' or $(Platform) == 'x64'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
100101
</ClCompile>
101102
</ItemDefinitionGroup>
102103
<ItemGroup>
@@ -130,9 +131,11 @@
130131
<ClCompile Include="$(zlibNgDir)\zutil.c" />
131132
<ClCompile Include="$(zlibNgDir)\cpu_features.c" />
132133
<ClInclude Include="$(zlibNgDir)\arch\generic\generic_functions.h" />
134+
<ClInclude Include="$(zlibNgDir)\fallback_builtins.h" />
135+
</ItemGroup>
136+
<ItemGroup Condition="$(Platform) == 'Win32' or $(Platform) == 'x64'">
133137
<ClInclude Include="$(zlibNgDir)\arch\x86\x86_functions.h" />
134138
<ClInclude Include="$(zlibNgDir)\arch\x86\x86_features.h" />
135-
<ClInclude Include="$(zlibNgDir)\fallback_builtins.h" />
136139
<ClInclude Include="$(zlibNgDir)\arch\x86\adler32_avx512_p.h" />
137140
<ClCompile Include="$(zlibNgDir)\arch\x86\x86_features.c" />
138141
<ClCompile Include="$(zlibNgDir)\arch\x86\chunkset_sse2.c" />
@@ -150,6 +153,8 @@
150153
<ClCompile Include="$(zlibNgDir)\arch\x86\chunkset_avx512.c" />
151154
<ClCompile Include="$(zlibNgDir)\arch\x86\adler32_avx512_vnni.c" />
152155
<ClCompile Include="$(zlibNgDir)\arch\x86\crc32_vpclmulqdq.c" />
156+
</ItemGroup>
157+
<ItemGroup>
153158
<ClInclude Include="..\PC\zconf.h" />
154159
<ClInclude Include="..\PC\zlib.h" />
155160
<ClInclude Include="$(zlibNgDir)\arch\generic\chunk_permute_table.h" />

0 commit comments

Comments
 (0)