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) --- .../run-generators/run-generators.vcxproj | 612 ++++++++++++--------- .../run-generators/run-generators.vcxproj.filters | 92 ++-- 2 files changed, 412 insertions(+), 292 deletions(-) (limited to 'build/visual-studio/run-generators') diff --git a/build/visual-studio/run-generators/run-generators.vcxproj b/build/visual-studio/run-generators/run-generators.vcxproj index 98f121f9f..cb8a760b2 100644 --- a/build/visual-studio/run-generators/run-generators.vcxproj +++ b/build/visual-studio/run-generators/run-generators.vcxproj @@ -1,247 +1,367 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {E145B2B8-CD13-A6BE-B6A7-16E5A2148223} - true - Win32Proj - run-generators - - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - true - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - StaticLibrary - false - Unicode - v142 - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\run-generators\ - run-generators - .lib - - - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\run-generators\ - run-generators - .lib - - - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\run-generators\ - run-generators - .lib - - - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\run-generators\ - run-generators - .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 - - - - - - - - - - - - - Document - "../../../bin/windows-x86/debug/slang-embed" %(Identity) - "../../../bin/windows-x64/debug/slang-embed" %(Identity) - "../../../bin/windows-x86/release/slang-embed" %(Identity) - "../../../bin/windows-x64/release/slang-embed" %(Identity) - ../../../prelude/slang-cpp-prelude.h.cpp - slang-embed %(Identity) - ../../../bin/windows-x86/debug/slang-embed.exe - ../../../bin/windows-x64/debug/slang-embed.exe - ../../../bin/windows-x86/release/slang-embed.exe - ../../../bin/windows-x64/release/slang-embed.exe - - - Document - "../../../bin/windows-x86/debug/slang-embed" %(Identity) - "../../../bin/windows-x64/debug/slang-embed" %(Identity) - "../../../bin/windows-x86/release/slang-embed" %(Identity) - "../../../bin/windows-x64/release/slang-embed" %(Identity) - ../../../prelude/slang-cuda-prelude.h.cpp - slang-embed %(Identity) - ../../../bin/windows-x86/debug/slang-embed.exe - ../../../bin/windows-x64/debug/slang-embed.exe - ../../../bin/windows-x86/release/slang-embed.exe - ../../../bin/windows-x64/release/slang-embed.exe - - - Document - "../../../bin/windows-x86/debug/slang-embed" %(Identity) - "../../../bin/windows-x64/debug/slang-embed" %(Identity) - "../../../bin/windows-x86/release/slang-embed" %(Identity) - "../../../bin/windows-x64/release/slang-embed" %(Identity) - ../../../prelude/slang-hlsl-prelude.h.cpp - slang-embed %(Identity) - ../../../bin/windows-x86/debug/slang-embed.exe - ../../../bin/windows-x64/debug/slang-embed.exe - ../../../bin/windows-x86/release/slang-embed.exe - ../../../bin/windows-x64/release/slang-embed.exe - - - Document - "../../../bin/windows-x86/debug/slang-generate" %(Identity) - "../../../bin/windows-x64/debug/slang-generate" %(Identity) - "../../../bin/windows-x86/release/slang-generate" %(Identity) - "../../../bin/windows-x64/release/slang-generate" %(Identity) - ../../../source/slang/core.meta.slang.h - slang-generate %(Identity) - ../../../bin/windows-x86/debug/slang-generate.exe - ../../../bin/windows-x64/debug/slang-generate.exe - ../../../bin/windows-x86/release/slang-generate.exe - ../../../bin/windows-x64/release/slang-generate.exe - - - Document - "../../../bin/windows-x86/debug/slang-generate" %(Identity) - "../../../bin/windows-x64/debug/slang-generate" %(Identity) - "../../../bin/windows-x86/release/slang-generate" %(Identity) - "../../../bin/windows-x64/release/slang-generate" %(Identity) - ../../../source/slang/hlsl.meta.slang.h - slang-generate %(Identity) - ../../../bin/windows-x86/debug/slang-generate.exe - ../../../bin/windows-x64/debug/slang-generate.exe - ../../../bin/windows-x86/release/slang-generate.exe - ../../../bin/windows-x64/release/slang-generate.exe - - - Document - "../../../bin/windows-x86/debug/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - "../../../bin/windows-x64/debug/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - "../../../bin/windows-x86/release/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - "../../../bin/windows-x64/release/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS - ../../../source/slang/slang-generated-obj.h;../../../source/slang/slang-generated-obj-macro.h;../../../source/slang/slang-generated-ast.h;../../../source/slang/slang-generated-ast-macro.h;../../../source/slang/slang-generated-value.h;../../../source/slang/slang-generated-value-macro.h - C++ Extractor %(Identity) - ../../../bin/windows-x86/debug/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - ../../../bin/windows-x64/debug/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - ../../../bin/windows-x86/release/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - ../../../bin/windows-x64/release/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h - - - - - + + + + + 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 + + + + {E145B2B8-CD13-A6BE-B6A7-16E5A2148223} + true + Win32Proj + run-generators + + + + 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\run-generators\ + run-generators + .lib + + + ..\..\..\bin\windows-x64\debug\ + ..\..\..\intermediate\windows-x64\debug\run-generators\ + run-generators + .lib + + + ..\..\..\bin\windows-aarch64\debug\ + ..\..\..\intermediate\windows-aarch64\debug\run-generators\ + run-generators + .lib + + + ..\..\..\bin\windows-x86\release\ + ..\..\..\intermediate\windows-x86\release\run-generators\ + run-generators + .lib + + + ..\..\..\bin\windows-x64\release\ + ..\..\..\intermediate\windows-x64\release\run-generators\ + run-generators + .lib + + + ..\..\..\bin\windows-aarch64\release\ + ..\..\..\intermediate\windows-aarch64\release\run-generators\ + run-generators + .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 + + + + + + + + + + + + + Document + "../../../bin/windows-x86/debug/slang-embed" %(Identity) + "../../../bin/windows-x64/debug/slang-embed" %(Identity) + "$(SolutionDir)/bin/windows-x64/debug/slang-embed" %(Identity) + "../../../bin/windows-x86/release/slang-embed" %(Identity) + "../../../bin/windows-x64/release/slang-embed" %(Identity) + "$(SolutionDir)/bin/windows-x64/release/slang-embed" %(Identity) + ../../../prelude/slang-cpp-prelude.h.cpp + slang-embed %(Identity) + ../../../bin/windows-x86/debug/slang-embed.exe + ../../../bin/windows-x64/debug/slang-embed.exe + ../../../bin/windows-x64/debug/slang-embed.exe + ../../../bin/windows-x86/release/slang-embed.exe + ../../../bin/windows-x64/release/slang-embed.exe + ../../../bin/windows-x64/release/slang-embed.exe + + + Document + "../../../bin/windows-x86/debug/slang-embed" %(Identity) + "../../../bin/windows-x64/debug/slang-embed" %(Identity) + "$(SolutionDir)/bin/windows-x64/debug/slang-embed" %(Identity) + "../../../bin/windows-x86/release/slang-embed" %(Identity) + "../../../bin/windows-x64/release/slang-embed" %(Identity) + "$(SolutionDir)/bin/windows-x64/release/slang-embed" %(Identity) + ../../../prelude/slang-cuda-prelude.h.cpp + slang-embed %(Identity) + ../../../bin/windows-x86/debug/slang-embed.exe + ../../../bin/windows-x64/debug/slang-embed.exe + ../../../bin/windows-x64/debug/slang-embed.exe + ../../../bin/windows-x86/release/slang-embed.exe + ../../../bin/windows-x64/release/slang-embed.exe + ../../../bin/windows-x64/release/slang-embed.exe + + + Document + "../../../bin/windows-x86/debug/slang-embed" %(Identity) + "../../../bin/windows-x64/debug/slang-embed" %(Identity) + "$(SolutionDir)/bin/windows-x64/debug/slang-embed" %(Identity) + "../../../bin/windows-x86/release/slang-embed" %(Identity) + "../../../bin/windows-x64/release/slang-embed" %(Identity) + "$(SolutionDir)/bin/windows-x64/release/slang-embed" %(Identity) + ../../../prelude/slang-hlsl-prelude.h.cpp + slang-embed %(Identity) + ../../../bin/windows-x86/debug/slang-embed.exe + ../../../bin/windows-x64/debug/slang-embed.exe + ../../../bin/windows-x64/debug/slang-embed.exe + ../../../bin/windows-x86/release/slang-embed.exe + ../../../bin/windows-x64/release/slang-embed.exe + ../../../bin/windows-x64/release/slang-embed.exe + + + Document + "../../../bin/windows-x86/debug/slang-generate" %(Identity) + "../../../bin/windows-x64/debug/slang-generate" %(Identity) + "$(SolutionDir)/bin/windows-x64/debug/slang-generate" %(Identity) + "../../../bin/windows-x86/release/slang-generate" %(Identity) + "../../../bin/windows-x64/release/slang-generate" %(Identity) + "$(SolutionDir)/bin/windows-x64/release/slang-generate" %(Identity) + ../../../source/slang/core.meta.slang.h + slang-generate %(Identity) + ../../../bin/windows-x86/debug/slang-generate.exe + ../../../bin/windows-x64/debug/slang-generate.exe + ../../../bin/windows-x64/debug/slang-generate.exe + ../../../bin/windows-x86/release/slang-generate.exe + ../../../bin/windows-x64/release/slang-generate.exe + ../../../bin/windows-x64/release/slang-generate.exe + + + Document + "../../../bin/windows-x86/debug/slang-generate" %(Identity) + "../../../bin/windows-x64/debug/slang-generate" %(Identity) + "$(SolutionDir)/bin/windows-x64/debug/slang-generate" %(Identity) + "../../../bin/windows-x86/release/slang-generate" %(Identity) + "../../../bin/windows-x64/release/slang-generate" %(Identity) + "$(SolutionDir)/bin/windows-x64/release/slang-generate" %(Identity) + ../../../source/slang/hlsl.meta.slang.h + slang-generate %(Identity) + ../../../bin/windows-x86/debug/slang-generate.exe + ../../../bin/windows-x64/debug/slang-generate.exe + ../../../bin/windows-x64/debug/slang-generate.exe + ../../../bin/windows-x86/release/slang-generate.exe + ../../../bin/windows-x64/release/slang-generate.exe + ../../../bin/windows-x64/release/slang-generate.exe + + + Document + "../../../bin/windows-x86/debug/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS + "../../../bin/windows-x64/debug/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS + "$(SolutionDir)/bin/windows-x64/debug/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS + "../../../bin/windows-x86/release/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS + "../../../bin/windows-x64/release/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS + "$(SolutionDir)/bin/windows-x64/release/slang-cpp-extractor" -d %(RootDir)%(Directory) slang-ast-support-types.h slang-ast-base.h slang-ast-decl.h slang-ast-expr.h slang-ast-modifier.h slang-ast-stmt.h slang-ast-type.h slang-ast-val.h -strip-prefix slang- -o slang-generated -output-fields -mark-suffix _CLASS + ../../../source/slang/slang-generated-obj.h;../../../source/slang/slang-generated-obj-macro.h;../../../source/slang/slang-generated-ast.h;../../../source/slang/slang-generated-ast-macro.h;../../../source/slang/slang-generated-value.h;../../../source/slang/slang-generated-value-macro.h + C++ Extractor %(Identity) + ../../../bin/windows-x86/debug/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h + ../../../bin/windows-x64/debug/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h + ../../../bin/windows-x64/debug/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h + ../../../bin/windows-x86/release/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h + ../../../bin/windows-x64/release/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h + ../../../bin/windows-x64/release/slang-cpp-extractor.exe;../../../source/slang/slang-ast-support-types.h;../../../source/slang/slang-ast-base.h;../../../source/slang/slang-ast-decl.h;../../../source/slang/slang-ast-expr.h;../../../source/slang/slang-ast-modifier.h;../../../source/slang/slang-ast-stmt.h;../../../source/slang/slang-ast-type.h;../../../source/slang/slang-ast-val.h + + + + + \ No newline at end of file diff --git a/build/visual-studio/run-generators/run-generators.vcxproj.filters b/build/visual-studio/run-generators/run-generators.vcxproj.filters index c535b0a02..775c3672c 100644 --- a/build/visual-studio/run-generators/run-generators.vcxproj.filters +++ b/build/visual-studio/run-generators/run-generators.vcxproj.filters @@ -1,47 +1,47 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Source Files - - - Source Files - - - Header Files - - + + + + + {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} + + + {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} + + + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Source Files + + + Source Files + + + Header Files + + \ No newline at end of file -- cgit v1.2.3