From 255fd5873f65a6b01d5385c277d55612dc3cc587 Mon Sep 17 00:00:00 2001 From: Yong He Date: Mon, 28 Mar 2022 22:14:33 -0700 Subject: Allow slangc to generate exe from .slang file. (#2170) --- .../heterogeneous-first-gen.vcxproj | 168 --------- .../heterogeneous-hello-world.vcxproj | 324 ----------------- .../heterogeneous-hello-world.vcxproj.filters | 21 -- .../run-generators/run-generators.vcxproj | 17 + .../run-generators/run-generators.vcxproj.filters | 3 + build/visual-studio/slang-rt/slang-rt.vcxproj | 396 +++++++++++++++++++++ .../slang-rt/slang-rt.vcxproj.filters | 326 +++++++++++++++++ build/visual-studio/slang/slang.vcxproj | 1 + build/visual-studio/slang/slang.vcxproj.filters | 3 + 9 files changed, 746 insertions(+), 513 deletions(-) delete mode 100644 build/visual-studio/heterogeneous-hello-world/heterogeneous-first-gen.vcxproj delete mode 100644 build/visual-studio/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj delete mode 100644 build/visual-studio/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj.filters create mode 100644 build/visual-studio/slang-rt/slang-rt.vcxproj create mode 100644 build/visual-studio/slang-rt/slang-rt.vcxproj.filters (limited to 'build') diff --git a/build/visual-studio/heterogeneous-hello-world/heterogeneous-first-gen.vcxproj b/build/visual-studio/heterogeneous-hello-world/heterogeneous-first-gen.vcxproj deleted file mode 100644 index a2181ad08..000000000 --- a/build/visual-studio/heterogeneous-hello-world/heterogeneous-first-gen.vcxproj +++ /dev/null @@ -1,168 +0,0 @@ - - - - - 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 - - - - {3E8C6F8B-AAC3-B722-B3CD-1B461F84DE1B} - true - Win32Proj - heterogeneous-first-gen - - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - Utility - v142 - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\..\bin\windows-x86\debug\ - obj\x86\Debug\ - - - ..\..\..\bin\windows-x64\debug\ - obj\x64\Debug\ - - - ..\..\..\bin\windows-aarch64\debug\ - obj\aarch64\Debug\ - - - ..\..\..\bin\windows-x86\release\ - obj\x86\Release\ - - - ..\..\..\bin\windows-x64\release\ - obj\x64\Release\ - - - ..\..\..\bin\windows-aarch64\release\ - obj\aarch64\Release\ - - - - "../../../bin/windows-x86/debug/slangc" "../../../examples/heterogeneous-hello-world/shader.slang" -o "../../../examples/heterogeneous-hello-world/shader.cpp" -heterogeneous -target cpp -target hlsl - - - - - "../../../bin/windows-x64/debug/slangc" "../../../examples/heterogeneous-hello-world/shader.slang" -o "../../../examples/heterogeneous-hello-world/shader.cpp" -heterogeneous -target cpp -target hlsl - - - - - "../../../bin/windows-aarch64/debug/slangc" "../../../examples/heterogeneous-hello-world/shader.slang" -o "../../../examples/heterogeneous-hello-world/shader.cpp" -heterogeneous -target cpp -target hlsl - - - - - "../../../bin/windows-x86/release/slangc" "../../../examples/heterogeneous-hello-world/shader.slang" -o "../../../examples/heterogeneous-hello-world/shader.cpp" -heterogeneous -target cpp -target hlsl - - - - - "../../../bin/windows-x64/release/slangc" "../../../examples/heterogeneous-hello-world/shader.slang" -o "../../../examples/heterogeneous-hello-world/shader.cpp" -heterogeneous -target cpp -target hlsl - - - - - "../../../bin/windows-aarch64/release/slangc" "../../../examples/heterogeneous-hello-world/shader.slang" -o "../../../examples/heterogeneous-hello-world/shader.cpp" -heterogeneous -target cpp -target hlsl - - - - - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj b/build/visual-studio/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj deleted file mode 100644 index 3e3049f65..000000000 --- a/build/visual-studio/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj +++ /dev/null @@ -1,324 +0,0 @@ - - - - - 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 - - - - {150CAA5A-0177-6A66-AA92-CFCB96DC2D49} - true - Win32Proj - heterogeneous-hello-world - - - - Application - true - Unicode - v142 - - - Application - true - Unicode - v142 - - - Application - true - Unicode - v142 - true - - - Application - false - Unicode - v142 - - - Application - false - Unicode - v142 - - - Application - false - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - - - - - - - true - ..\..\..\bin\windows-x86\debug\ - ..\..\..\intermediate\windows-x86\debug\heterogeneous-hello-world\ - heterogeneous-hello-world - .exe - - - true - ..\..\..\bin\windows-x64\debug\ - ..\..\..\intermediate\windows-x64\debug\heterogeneous-hello-world\ - heterogeneous-hello-world - .exe - - - true - ..\..\..\bin\windows-aarch64\debug\ - ..\..\..\intermediate\windows-aarch64\debug\heterogeneous-hello-world\ - heterogeneous-hello-world - .exe - - - false - ..\..\..\bin\windows-x86\release\ - ..\..\..\intermediate\windows-x86\release\heterogeneous-hello-world\ - heterogeneous-hello-world - .exe - - - false - ..\..\..\bin\windows-x64\release\ - ..\..\..\intermediate\windows-x64\release\heterogeneous-hello-world\ - heterogeneous-hello-world - .exe - - - false - ..\..\..\bin\windows-aarch64\release\ - ..\..\..\intermediate\windows-aarch64\release\heterogeneous-hello-world\ - heterogeneous-hello-world - .exe - - - - NotUsing - Level3 - _DEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - MultiThreadedDebug - - - Console - true - - - "../../../bin/windows-x86/debug/slangc" "../../../examples/heterogeneous-hello-world/shader.slang" -o "../../../examples/heterogeneous-hello-world/shader.cpp" -heterogeneous -target cpp -target hlsl - Generating shader.cpp in ../../../examples/heterogeneous-hello-world/ - - - - - NotUsing - Level3 - _DEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - MultiThreadedDebug - - - Console - true - - - "../../../bin/windows-x64/debug/slangc" "../../../examples/heterogeneous-hello-world/shader.slang" -o "../../../examples/heterogeneous-hello-world/shader.cpp" -heterogeneous -target cpp -target hlsl - Generating shader.cpp in ../../../examples/heterogeneous-hello-world/ - - - - - NotUsing - Level3 - _DEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - MultiThreadedDebug - - - Console - true - - - "../../../bin/windows-aarch64/debug/slangc" "../../../examples/heterogeneous-hello-world/shader.slang" -o "../../../examples/heterogeneous-hello-world/shader.cpp" -heterogeneous -target cpp -target hlsl - Generating shader.cpp in ../../../examples/heterogeneous-hello-world/ - - - - - NotUsing - Level3 - NDEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Console - true - true - - - "../../../bin/windows-x86/release/slangc" "../../../examples/heterogeneous-hello-world/shader.slang" -o "../../../examples/heterogeneous-hello-world/shader.cpp" -heterogeneous -target cpp -target hlsl - Generating shader.cpp in ../../../examples/heterogeneous-hello-world/ - - - - - NotUsing - Level3 - NDEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Console - true - true - - - "../../../bin/windows-x64/release/slangc" "../../../examples/heterogeneous-hello-world/shader.slang" -o "../../../examples/heterogeneous-hello-world/shader.cpp" -heterogeneous -target cpp -target hlsl - Generating shader.cpp in ../../../examples/heterogeneous-hello-world/ - - - - - NotUsing - Level3 - NDEBUG;%(PreprocessorDefinitions) - ..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Console - true - true - - - "../../../bin/windows-aarch64/release/slangc" "../../../examples/heterogeneous-hello-world/shader.slang" -o "../../../examples/heterogeneous-hello-world/shader.cpp" -heterogeneous -target cpp -target hlsl - Generating shader.cpp in ../../../examples/heterogeneous-hello-world/ - - - - - - - - - - - - {37BED5B5-23FA-D81F-8C0C-F1167867813A} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - {222F7498-B40C-4F3F-A704-DDEB91A4484A} - - - {F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B} - - - {D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7} - - - {3565FE5E-4FA3-11EB-AE93-0242AC130002} - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - {3E8C6F8B-AAC3-B722-B3CD-1B461F84DE1B} - - - - - - \ No newline at end of file diff --git a/build/visual-studio/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj.filters b/build/visual-studio/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj.filters deleted file mode 100644 index 3b195e092..000000000 --- a/build/visual-studio/heterogeneous-hello-world/heterogeneous-hello-world.vcxproj.filters +++ /dev/null @@ -1,21 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - Source Files - - - - - Source Files - - - \ No newline at end of file diff --git a/build/visual-studio/run-generators/run-generators.vcxproj b/build/visual-studio/run-generators/run-generators.vcxproj index 6e10e3ca1..c8a99e931 100644 --- a/build/visual-studio/run-generators/run-generators.vcxproj +++ b/build/visual-studio/run-generators/run-generators.vcxproj @@ -258,6 +258,23 @@ + + 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-host-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) diff --git a/build/visual-studio/run-generators/run-generators.vcxproj.filters b/build/visual-studio/run-generators/run-generators.vcxproj.filters index 775c3672c..609af9779 100644 --- a/build/visual-studio/run-generators/run-generators.vcxproj.filters +++ b/build/visual-studio/run-generators/run-generators.vcxproj.filters @@ -25,6 +25,9 @@ + + Header Files + Header Files diff --git a/build/visual-studio/slang-rt/slang-rt.vcxproj b/build/visual-studio/slang-rt/slang-rt.vcxproj new file mode 100644 index 000000000..c0fab7f97 --- /dev/null +++ b/build/visual-studio/slang-rt/slang-rt.vcxproj @@ -0,0 +1,396 @@ + + + + + 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 + + + + {DFC79D72-91DE-434C-871B-B3943B488BEB} + true + Win32Proj + slang-rt + + + + DynamicLibrary + true + Unicode + v142 + + + DynamicLibrary + true + Unicode + v142 + + + DynamicLibrary + true + Unicode + v142 + true + + + DynamicLibrary + false + Unicode + v142 + + + DynamicLibrary + false + Unicode + v142 + + + DynamicLibrary + false + Unicode + v142 + true + + + + + + + + + + + + + + + + + + + + + + + + + true + ..\..\..\bin\windows-x86\debug\ + ..\..\..\intermediate\windows-x86\debug\slang-rt\ + slang-rt + .dll + + + true + ..\..\..\bin\windows-x64\debug\ + ..\..\..\intermediate\windows-x64\debug\slang-rt\ + slang-rt + .dll + + + true + ..\..\..\bin\windows-aarch64\debug\ + ..\..\..\intermediate\windows-aarch64\debug\slang-rt\ + slang-rt + .dll + + + false + ..\..\..\bin\windows-x86\release\ + ..\..\..\intermediate\windows-x86\release\slang-rt\ + slang-rt + .dll + + + false + ..\..\..\bin\windows-x64\release\ + ..\..\..\intermediate\windows-x64\release\slang-rt\ + slang-rt + .dll + + + false + ..\..\..\bin\windows-aarch64\release\ + ..\..\..\intermediate\windows-aarch64\release\slang-rt\ + slang-rt + .dll + + + + NotUsing + Level4 + true + _DEBUG;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + ProgramDatabase + Disabled + MultiThreadedDebug + + + Windows + true + ..\..\..\bin\windows-x86\debug\slang-rt.lib + true + + + + + NotUsing + Level4 + true + _DEBUG;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + ProgramDatabase + Disabled + MultiThreadedDebug + + + Windows + true + ..\..\..\bin\windows-x64\debug\slang-rt.lib + true + + + + + NotUsing + Level4 + true + _DEBUG;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + ProgramDatabase + Disabled + MultiThreadedDebug + + + Windows + true + ..\..\..\bin\windows-aarch64\debug\slang-rt.lib + true + + + + + NotUsing + Level4 + true + NDEBUG;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + Full + true + true + false + true + MultiThreaded + + + Windows + true + true + ..\..\..\bin\windows-x86\release\slang-rt.lib + true + + + + + NotUsing + Level4 + true + NDEBUG;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + Full + true + true + false + true + MultiThreaded + + + Windows + true + true + ..\..\..\bin\windows-x64\release\slang-rt.lib + true + + + + + NotUsing + Level4 + true + NDEBUG;SLANG_RT_DYNAMIC;SLANG_RT_DYNAMIC_EXPORT;%(PreprocessorDefinitions) + Full + true + true + false + true + MultiThreaded + + + Windows + true + true + ..\..\..\bin\windows-aarch64\release\slang-rt.lib + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {E76ACB11-4A12-4F0A-BE1E-CE0B8836EB7F} + + + {E1EC8075-823E-46E5-BC38-C124CCCDF878} + + + + + + \ No newline at end of file diff --git a/build/visual-studio/slang-rt/slang-rt.vcxproj.filters b/build/visual-studio/slang-rt/slang-rt.vcxproj.filters new file mode 100644 index 000000000..51b0313f6 --- /dev/null +++ b/build/visual-studio/slang-rt/slang-rt.vcxproj.filters @@ -0,0 +1,326 @@ + + + + + {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 + + + 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 + + + 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 + + + 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 diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj index 61ddc40f4..a54c4da89 100644 --- a/build/visual-studio/slang/slang.vcxproj +++ b/build/visual-studio/slang/slang.vcxproj @@ -432,6 +432,7 @@ IF EXIST ..\..\..\external\slang-binaries\bin\windows-aarch64\slang-glslang.dll\ + diff --git a/build/visual-studio/slang/slang.vcxproj.filters b/build/visual-studio/slang/slang.vcxproj.filters index ba0e4fe52..3b88a758a 100644 --- a/build/visual-studio/slang/slang.vcxproj.filters +++ b/build/visual-studio/slang/slang.vcxproj.filters @@ -389,6 +389,9 @@ + + Header Files + Header Files -- cgit v1.2.3