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) --- .../compiler-core/compiler-core.vcxproj | 566 ++++++++++++--------- .../compiler-core/compiler-core.vcxproj.filters | 316 ++++++------ 2 files changed, 493 insertions(+), 389 deletions(-) (limited to 'build/visual-studio/compiler-core') diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj b/build/visual-studio/compiler-core/compiler-core.vcxproj index 86dec62fc..5efec25cd 100644 --- a/build/visual-studio/compiler-core/compiler-core.vcxproj +++ b/build/visual-studio/compiler-core/compiler-core.vcxproj @@ -1,232 +1,336 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126} - true - Win32Proj - compiler-core - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\compiler-core\ - compiler-core - .lib - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\compiler-core\ - compiler-core - .lib - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\compiler-core\ - compiler-core - .lib - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\compiler-core\ - compiler-core - .lib - - - - NotUsing - Level4 - true - _DEBUG;%(PreprocessorDefinitions) - EditAndContinue - Disabled - MultiThreadedDebug - - - Windows - true - - - true - - - - - NotUsing - Level4 - true - _DEBUG;%(PreprocessorDefinitions) - EditAndContinue - Disabled - MultiThreadedDebug - - - Windows - true - - - true - - - - - NotUsing - Level4 - true - NDEBUG;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - - - Windows - true - true - - - true - - - - - NotUsing - Level4 - true - NDEBUG;%(PreprocessorDefinitions) - Full - true - true - false - true - MultiThreaded - - - Windows - true - true - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - - - + + + + + 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 + + + + {12C1E89D-F5D0-41D3-8E8D-FB3F358F8126} + true + Win32Proj + compiler-core + + + + 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\compiler-core\ + compiler-core + .lib + + + ..\..\..\bin\windows-x64\debug\ + ..\..\..\intermediate\windows-x64\debug\compiler-core\ + compiler-core + .lib + + + ..\..\..\bin\windows-aarch64\debug\ + ..\..\..\intermediate\windows-aarch64\debug\compiler-core\ + compiler-core + .lib + + + ..\..\..\bin\windows-x86\release\ + ..\..\..\intermediate\windows-x86\release\compiler-core\ + compiler-core + .lib + + + ..\..\..\bin\windows-x64\release\ + ..\..\..\intermediate\windows-x64\release\compiler-core\ + compiler-core + .lib + + + ..\..\..\bin\windows-aarch64\release\ + ..\..\..\intermediate\windows-aarch64\release\compiler-core\ + compiler-core + .lib + + + + NotUsing + Level4 + true + _DEBUG;%(PreprocessorDefinitions) + EditAndContinue + Disabled + MultiThreadedDebug + + + Windows + true + + + true + + + + + NotUsing + Level4 + true + _DEBUG;%(PreprocessorDefinitions) + EditAndContinue + Disabled + MultiThreadedDebug + + + Windows + true + + + true + + + + + NotUsing + Level4 + true + _DEBUG;%(PreprocessorDefinitions) + ProgramDatabase + Disabled + MultiThreadedDebug + + + Windows + true + + + true + + + + + NotUsing + Level4 + true + NDEBUG;%(PreprocessorDefinitions) + Full + true + true + false + true + MultiThreaded + + + Windows + true + true + + + true + + + + + NotUsing + Level4 + true + NDEBUG;%(PreprocessorDefinitions) + Full + true + true + false + true + MultiThreaded + + + Windows + true + true + + + true + + + + + NotUsing + Level4 + true + NDEBUG;%(PreprocessorDefinitions) + Full + true + true + false + true + MultiThreaded + + + Windows + true + true + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {F9BE7957-8399-899E-0C49-E714FDDD4B65} + + + + + \ No newline at end of file diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj.filters b/build/visual-studio/compiler-core/compiler-core.vcxproj.filters index d68b6e630..dda33865a 100644 --- a/build/visual-studio/compiler-core/compiler-core.vcxproj.filters +++ b/build/visual-studio/compiler-core/compiler-core.vcxproj.filters @@ -1,159 +1,159 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - + + + + + {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} + + + {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file -- cgit v1.2.3