From aa8f7b899b7b562b3d3c6e25c3da41569505e70c Mon Sep 17 00:00:00 2001 From: Chad Engler Date: Wed, 29 Sep 2021 13:02:47 -0700 Subject: Fix ARM64 detection for MSVC (#1951) --- build/visual-studio/miniz/miniz.vcxproj | 424 ++++++++++++++++++++------------ 1 file changed, 260 insertions(+), 164 deletions(-) (limited to 'build/visual-studio/miniz') diff --git a/build/visual-studio/miniz/miniz.vcxproj b/build/visual-studio/miniz/miniz.vcxproj index e3f721123..4eb65213a 100644 --- a/build/visual-studio/miniz/miniz.vcxproj +++ b/build/visual-studio/miniz/miniz.vcxproj @@ -1,165 +1,261 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F} - true - Win32Proj - miniz - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\miniz\ - miniz - .lib - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\miniz\ - miniz - .lib - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\miniz\ - miniz - .lib - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\miniz\ - miniz - .lib - - - - NotUsing - Level3 - _DEBUG;%(PreprocessorDefinitions) - EditAndContinue - Disabled - MultiThreadedDebug - - - Windows - true - - - - - NotUsing - Level3 - _DEBUG;%(PreprocessorDefinitions) - EditAndContinue - Disabled - MultiThreadedDebug - - - Windows - true - - - - - NotUsing - Level3 - NDEBUG;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - - - Windows - true - true - - - - - NotUsing - Level3 - NDEBUG;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - - - Windows - true - true - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Debug + ARM + + + Debug aarch64 + Win32 + + + Debug aarch64 + x64 + + + Debug aarch64 + ARM + + + Release + Win32 + + + Release + x64 + + + Release + ARM + + + Release aarch64 + Win32 + + + Release aarch64 + x64 + + + Release aarch64 + ARM + + + + {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F} + true + Win32Proj + miniz + + + + StaticLibrary + true + Unicode + v142 + + + StaticLibrary + true + Unicode + v142 + + + StaticLibrary + true + Unicode + v142 + true + + + StaticLibrary + false + Unicode + v142 + + + StaticLibrary + false + Unicode + v142 + + + StaticLibrary + false + Unicode + v142 + true + + + + + + + + + + + + + + + + + + + + + + + + + ..\..\..\bin\windows-x86\debug\ + ..\..\..\intermediate\windows-x86\debug\miniz\ + miniz + .lib + + + ..\..\..\bin\windows-x64\debug\ + ..\..\..\intermediate\windows-x64\debug\miniz\ + miniz + .lib + + + ..\..\..\bin\windows-aarch64\debug\ + ..\..\..\intermediate\windows-aarch64\debug\miniz\ + miniz + .lib + + + ..\..\..\bin\windows-x86\release\ + ..\..\..\intermediate\windows-x86\release\miniz\ + miniz + .lib + + + ..\..\..\bin\windows-x64\release\ + ..\..\..\intermediate\windows-x64\release\miniz\ + miniz + .lib + + + ..\..\..\bin\windows-aarch64\release\ + ..\..\..\intermediate\windows-aarch64\release\miniz\ + miniz + .lib + + + + NotUsing + Level3 + _DEBUG;%(PreprocessorDefinitions) + EditAndContinue + Disabled + MultiThreadedDebug + + + Windows + true + + + + + NotUsing + Level3 + _DEBUG;%(PreprocessorDefinitions) + EditAndContinue + Disabled + MultiThreadedDebug + + + Windows + true + + + + + NotUsing + Level3 + _DEBUG;%(PreprocessorDefinitions) + ProgramDatabase + Disabled + MultiThreadedDebug + + + Windows + true + + + + + NotUsing + Level3 + NDEBUG;%(PreprocessorDefinitions) + Full + true + true + false + true + MultiThreaded + + + Windows + true + true + + + + + NotUsing + Level3 + NDEBUG;%(PreprocessorDefinitions) + Full + true + true + false + true + MultiThreaded + + + Windows + true + true + + + + + NotUsing + Level3 + NDEBUG;%(PreprocessorDefinitions) + Full + true + true + false + true + MultiThreaded + + + Windows + true + true + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3