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/lz4/lz4.vcxproj | 424 +++++++++++++++++----------- build/visual-studio/lz4/lz4.vcxproj.filters | 52 ++-- 2 files changed, 286 insertions(+), 190 deletions(-) (limited to 'build/visual-studio/lz4') diff --git a/build/visual-studio/lz4/lz4.vcxproj b/build/visual-studio/lz4/lz4.vcxproj index 4854606e6..b272d3860 100644 --- a/build/visual-studio/lz4/lz4.vcxproj +++ b/build/visual-studio/lz4/lz4.vcxproj @@ -1,165 +1,261 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {E1EC8075-823E-46E5-BC38-C124CCCDF878} - true - Win32Proj - lz4 - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\lz4\ - lz4 - .lib - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\lz4\ - lz4 - .lib - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\lz4\ - lz4 - .lib - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\lz4\ - lz4 - .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 + + + + {E1EC8075-823E-46E5-BC38-C124CCCDF878} + true + Win32Proj + lz4 + + + + 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\lz4\ + lz4 + .lib + + + ..\..\..\bin\windows-x64\debug\ + ..\..\..\intermediate\windows-x64\debug\lz4\ + lz4 + .lib + + + ..\..\..\bin\windows-aarch64\debug\ + ..\..\..\intermediate\windows-aarch64\debug\lz4\ + lz4 + .lib + + + ..\..\..\bin\windows-x86\release\ + ..\..\..\intermediate\windows-x86\release\lz4\ + lz4 + .lib + + + ..\..\..\bin\windows-x64\release\ + ..\..\..\intermediate\windows-x64\release\lz4\ + lz4 + .lib + + + ..\..\..\bin\windows-aarch64\release\ + ..\..\..\intermediate\windows-aarch64\release\lz4\ + lz4 + .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 diff --git a/build/visual-studio/lz4/lz4.vcxproj.filters b/build/visual-studio/lz4/lz4.vcxproj.filters index 334f7bd80..35826b470 100644 --- a/build/visual-studio/lz4/lz4.vcxproj.filters +++ b/build/visual-studio/lz4/lz4.vcxproj.filters @@ -1,27 +1,27 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {2839F3DC-1406-4EE8-3D1F-3C90294B8376} - - - {512ED728-3D91-66CD-E616-9F83D2583250} - - - {F78D9302-E386-B254-0CB9-97D9F8109260} - - - - - Header Files - - - - - external\lz4\lib - - + + + + + {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} + + + {2839F3DC-1406-4EE8-3D1F-3C90294B8376} + + + {512ED728-3D91-66CD-E616-9F83D2583250} + + + {F78D9302-E386-B254-0CB9-97D9F8109260} + + + + + Header Files + + + + + external\lz4\lib + + \ No newline at end of file -- cgit v1.2.3