From 06c4926ec51ce9548f2dc44ee948a467d588def8 Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 8 Jul 2021 13:04:53 -0700 Subject: Update VS projects to 2019. (#1901) * Update VS projects to 2019. * Empty commit to trigger build --- .github/workflows/verify-solution-file.yml | 2 +- build/visual-studio/compiler-core/compiler-core.vcxproj | 10 +++++----- build/visual-studio/core/core.vcxproj | 10 +++++----- build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj | 10 +++++----- build/visual-studio/example-base/example-base.vcxproj | 10 +++++----- build/visual-studio/gfx-util/gfx-util.vcxproj | 10 +++++----- build/visual-studio/gfx/gfx.vcxproj | 12 ++++++------ build/visual-studio/gpu-printing/gpu-printing.vcxproj | 10 +++++----- build/visual-studio/hello-world/hello-world.vcxproj | 10 +++++----- build/visual-studio/lz4/lz4.vcxproj | 10 +++++----- build/visual-studio/miniz/miniz.vcxproj | 10 +++++----- build/visual-studio/model-viewer/model-viewer.vcxproj | 10 +++++----- build/visual-studio/platform/platform.vcxproj | 12 ++++++------ build/visual-studio/ray-tracing/ray-tracing.vcxproj | 10 +++++----- .../visual-studio/render-test-tool/render-test-tool.vcxproj | 12 ++++++------ build/visual-studio/run-generators/run-generators.vcxproj | 10 +++++----- build/visual-studio/shader-object/shader-object.vcxproj | 10 +++++----- build/visual-studio/shader-toy/shader-toy.vcxproj | 10 +++++----- .../slang-cpp-extractor/slang-cpp-extractor.vcxproj | 10 +++++----- build/visual-studio/slang-embed/slang-embed.vcxproj | 10 +++++----- build/visual-studio/slang-generate/slang-generate.vcxproj | 10 +++++----- .../slang-reflection-test-tool.vcxproj | 10 +++++----- build/visual-studio/slang-test/slang-test.vcxproj | 10 +++++----- build/visual-studio/slang/slang.vcxproj | 10 +++++----- build/visual-studio/slangc/slangc.vcxproj | 10 +++++----- build/visual-studio/triangle/triangle.vcxproj | 10 +++++----- external/slang-binaries | 2 +- github_build.sh | 2 +- premake.bat | 2 +- premake5.lua | 6 +++--- slang.sln | 2 +- 31 files changed, 136 insertions(+), 136 deletions(-) diff --git a/.github/workflows/verify-solution-file.yml b/.github/workflows/verify-solution-file.yml index efecd03a6..7610e05fd 100644 --- a/.github/workflows/verify-solution-file.yml +++ b/.github/workflows/verify-solution-file.yml @@ -16,7 +16,7 @@ jobs: fetch-depth: '1' - name: verify run: | - & .\premake.bat vs2017 + & .\premake.bat vs2019 $diff = & git diff if ($diff.length -ne 0) { diff --git a/build/visual-studio/compiler-core/compiler-core.vcxproj b/build/visual-studio/compiler-core/compiler-core.vcxproj index d472270cb..339bc73d1 100644 --- a/build/visual-studio/compiler-core/compiler-core.vcxproj +++ b/build/visual-studio/compiler-core/compiler-core.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary false Unicode - v141 + v142 StaticLibrary false Unicode - v141 + v142 diff --git a/build/visual-studio/core/core.vcxproj b/build/visual-studio/core/core.vcxproj index ae49ffd1e..de23fc61c 100644 --- a/build/visual-studio/core/core.vcxproj +++ b/build/visual-studio/core/core.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary false Unicode - v141 + v142 StaticLibrary false Unicode - v141 + v142 diff --git a/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj b/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj index 02e60ad19..e4e61a5fd 100644 --- a/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj +++ b/build/visual-studio/cpu-hello-world/cpu-hello-world.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application false Unicode - v141 + v142 Application false Unicode - v141 + v142 diff --git a/build/visual-studio/example-base/example-base.vcxproj b/build/visual-studio/example-base/example-base.vcxproj index 524dc4109..32ab1ebdb 100644 --- a/build/visual-studio/example-base/example-base.vcxproj +++ b/build/visual-studio/example-base/example-base.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary false Unicode - v141 + v142 StaticLibrary false Unicode - v141 + v142 diff --git a/build/visual-studio/gfx-util/gfx-util.vcxproj b/build/visual-studio/gfx-util/gfx-util.vcxproj index 96288d25d..c44f9ee2e 100644 --- a/build/visual-studio/gfx-util/gfx-util.vcxproj +++ b/build/visual-studio/gfx-util/gfx-util.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary false Unicode - v141 + v142 StaticLibrary false Unicode - v141 + v142 diff --git a/build/visual-studio/gfx/gfx.vcxproj b/build/visual-studio/gfx/gfx.vcxproj index b3ec429e6..5c575054c 100644 --- a/build/visual-studio/gfx/gfx.vcxproj +++ b/build/visual-studio/gfx/gfx.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -23,32 +23,32 @@ true Win32Proj gfx - 10.0.14393.0 + 10.0 DynamicLibrary true Unicode - v141 + v142 DynamicLibrary true Unicode - v141 + v142 DynamicLibrary false Unicode - v141 + v142 DynamicLibrary false Unicode - v141 + v142 diff --git a/build/visual-studio/gpu-printing/gpu-printing.vcxproj b/build/visual-studio/gpu-printing/gpu-printing.vcxproj index 1f8bf4f7a..45a878b2c 100644 --- a/build/visual-studio/gpu-printing/gpu-printing.vcxproj +++ b/build/visual-studio/gpu-printing/gpu-printing.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application false Unicode - v141 + v142 Application false Unicode - v141 + v142 diff --git a/build/visual-studio/hello-world/hello-world.vcxproj b/build/visual-studio/hello-world/hello-world.vcxproj index 9cbdddaaf..5abe57bfb 100644 --- a/build/visual-studio/hello-world/hello-world.vcxproj +++ b/build/visual-studio/hello-world/hello-world.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application false Unicode - v141 + v142 Application false Unicode - v141 + v142 diff --git a/build/visual-studio/lz4/lz4.vcxproj b/build/visual-studio/lz4/lz4.vcxproj index bec177d3c..4854606e6 100644 --- a/build/visual-studio/lz4/lz4.vcxproj +++ b/build/visual-studio/lz4/lz4.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary false Unicode - v141 + v142 StaticLibrary false Unicode - v141 + v142 diff --git a/build/visual-studio/miniz/miniz.vcxproj b/build/visual-studio/miniz/miniz.vcxproj index 3b5b00c10..e3f721123 100644 --- a/build/visual-studio/miniz/miniz.vcxproj +++ b/build/visual-studio/miniz/miniz.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary false Unicode - v141 + v142 StaticLibrary false Unicode - v141 + v142 diff --git a/build/visual-studio/model-viewer/model-viewer.vcxproj b/build/visual-studio/model-viewer/model-viewer.vcxproj index 91fc851b1..b4590bd2f 100644 --- a/build/visual-studio/model-viewer/model-viewer.vcxproj +++ b/build/visual-studio/model-viewer/model-viewer.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application false Unicode - v141 + v142 Application false Unicode - v141 + v142 diff --git a/build/visual-studio/platform/platform.vcxproj b/build/visual-studio/platform/platform.vcxproj index 55d12d4c1..fee16dfa9 100644 --- a/build/visual-studio/platform/platform.vcxproj +++ b/build/visual-studio/platform/platform.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -23,32 +23,32 @@ true Win32Proj platform - 10.0.14393.0 + 10.0 DynamicLibrary true Unicode - v141 + v142 DynamicLibrary true Unicode - v141 + v142 DynamicLibrary false Unicode - v141 + v142 DynamicLibrary false Unicode - v141 + v142 diff --git a/build/visual-studio/ray-tracing/ray-tracing.vcxproj b/build/visual-studio/ray-tracing/ray-tracing.vcxproj index cc64fcd8c..04f76d42a 100644 --- a/build/visual-studio/ray-tracing/ray-tracing.vcxproj +++ b/build/visual-studio/ray-tracing/ray-tracing.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application false Unicode - v141 + v142 Application false Unicode - v141 + v142 diff --git a/build/visual-studio/render-test-tool/render-test-tool.vcxproj b/build/visual-studio/render-test-tool/render-test-tool.vcxproj index cc8a86ef9..79fbda5da 100644 --- a/build/visual-studio/render-test-tool/render-test-tool.vcxproj +++ b/build/visual-studio/render-test-tool/render-test-tool.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -23,32 +23,32 @@ true Win32Proj render-test-tool - 10.0.14393.0 + 10.0 DynamicLibrary true Unicode - v141 + v142 DynamicLibrary true Unicode - v141 + v142 DynamicLibrary false Unicode - v141 + v142 DynamicLibrary false Unicode - v141 + v142 diff --git a/build/visual-studio/run-generators/run-generators.vcxproj b/build/visual-studio/run-generators/run-generators.vcxproj index 4f196e043..2819cc616 100644 --- a/build/visual-studio/run-generators/run-generators.vcxproj +++ b/build/visual-studio/run-generators/run-generators.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary false Unicode - v141 + v142 StaticLibrary false Unicode - v141 + v142 diff --git a/build/visual-studio/shader-object/shader-object.vcxproj b/build/visual-studio/shader-object/shader-object.vcxproj index 7d0009f75..5ea54ba42 100644 --- a/build/visual-studio/shader-object/shader-object.vcxproj +++ b/build/visual-studio/shader-object/shader-object.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application false Unicode - v141 + v142 Application false Unicode - v141 + v142 diff --git a/build/visual-studio/shader-toy/shader-toy.vcxproj b/build/visual-studio/shader-toy/shader-toy.vcxproj index 2fb4edf04..e6db5d932 100644 --- a/build/visual-studio/shader-toy/shader-toy.vcxproj +++ b/build/visual-studio/shader-toy/shader-toy.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application false Unicode - v141 + v142 Application false Unicode - v141 + v142 diff --git a/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj index 14edfd5d1..595ed4428 100644 --- a/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj +++ b/build/visual-studio/slang-cpp-extractor/slang-cpp-extractor.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application false Unicode - v141 + v142 Application false Unicode - v141 + v142 diff --git a/build/visual-studio/slang-embed/slang-embed.vcxproj b/build/visual-studio/slang-embed/slang-embed.vcxproj index 4be17be5e..b1d320afa 100644 --- a/build/visual-studio/slang-embed/slang-embed.vcxproj +++ b/build/visual-studio/slang-embed/slang-embed.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application false Unicode - v141 + v142 Application false Unicode - v141 + v142 diff --git a/build/visual-studio/slang-generate/slang-generate.vcxproj b/build/visual-studio/slang-generate/slang-generate.vcxproj index 14bed1b55..fc92f0bef 100644 --- a/build/visual-studio/slang-generate/slang-generate.vcxproj +++ b/build/visual-studio/slang-generate/slang-generate.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application false Unicode - v141 + v142 Application false Unicode - v141 + v142 diff --git a/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj b/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj index ecdefcb49..e704b5456 100644 --- a/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj +++ b/build/visual-studio/slang-reflection-test-tool/slang-reflection-test-tool.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ DynamicLibrary true Unicode - v141 + v142 DynamicLibrary true Unicode - v141 + v142 DynamicLibrary false Unicode - v141 + v142 DynamicLibrary false Unicode - v141 + v142 diff --git a/build/visual-studio/slang-test/slang-test.vcxproj b/build/visual-studio/slang-test/slang-test.vcxproj index a0b7eb825..707ecbe2e 100644 --- a/build/visual-studio/slang-test/slang-test.vcxproj +++ b/build/visual-studio/slang-test/slang-test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application false Unicode - v141 + v142 Application false Unicode - v141 + v142 diff --git a/build/visual-studio/slang/slang.vcxproj b/build/visual-studio/slang/slang.vcxproj index ff754cb86..2b982f56e 100644 --- a/build/visual-studio/slang/slang.vcxproj +++ b/build/visual-studio/slang/slang.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ DynamicLibrary true Unicode - v141 + v142 DynamicLibrary true Unicode - v141 + v142 DynamicLibrary false Unicode - v141 + v142 DynamicLibrary false Unicode - v141 + v142 diff --git a/build/visual-studio/slangc/slangc.vcxproj b/build/visual-studio/slangc/slangc.vcxproj index 1a45c51b2..e21da56a3 100644 --- a/build/visual-studio/slangc/slangc.vcxproj +++ b/build/visual-studio/slangc/slangc.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application false Unicode - v141 + v142 Application false Unicode - v141 + v142 diff --git a/build/visual-studio/triangle/triangle.vcxproj b/build/visual-studio/triangle/triangle.vcxproj index c5c2fc33b..e7c4fbf0f 100644 --- a/build/visual-studio/triangle/triangle.vcxproj +++ b/build/visual-studio/triangle/triangle.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application false Unicode - v141 + v142 Application false Unicode - v141 + v142 diff --git a/external/slang-binaries b/external/slang-binaries index 63ca9c6c9..959b5c336 160000 --- a/external/slang-binaries +++ b/external/slang-binaries @@ -1 +1 @@ -Subproject commit 63ca9c6c92e50f00cfa5eafcd5fdfc704c8eccfa +Subproject commit 959b5c336907769f5df386735590b2bf8b50718f diff --git a/github_build.sh b/github_build.sh index ff76bf65e..82ab0be98 100644 --- a/github_build.sh +++ b/github_build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Get premake -wget https://github.com/shader-slang/slang-binaries/blob/master/premake/premake-5.0.0-alpha13/bin/linux-64/premake5?raw=true -O premake5 +wget https://github.com/shader-slang/slang-binaries/blob/master/premake/premake-5.0.0-alpha16/bin/linux-64/premake5?raw=true -O premake5 chmod u+x premake5 # generate slang-tag-version.h diff --git a/premake.bat b/premake.bat index d9f152e0f..28b404a73 100644 --- a/premake.bat +++ b/premake.bat @@ -1,3 +1,3 @@ @echo off set ROOT=%~dp0 -"%ROOT%\external\slang-binaries\premake\premake-5.0.0-alpha13\bin\windows-x64\premake5.exe" %* +"%ROOT%\external\slang-binaries\premake\premake-5.0.0-alpha16\bin\windows-x64\premake5.exe" %* diff --git a/premake5.lua b/premake5.lua index 77c69b345..2ed40ba16 100644 --- a/premake5.lua +++ b/premake5.lua @@ -795,7 +795,7 @@ toolSharedLibrary "render-test" if isTargetWindows then addSourceDir "tools/render-test/windows" - systemversion "10.0.14393.0" + systemversion "latest" -- For Windows targets, we want to copy -- dxcompiler.dll, and dxil.dll from the Windows SDK redistributable @@ -836,7 +836,7 @@ tool "gfx" -- To special case that we may be building using cygwin on windows. If 'true windows' we build for dx12/vk and run the script -- If not we assume it's a cygwin/mingw type situation and remove files that aren't appropriate if isTargetWindows then - systemversion "10.0.14393.0" + systemversion "latest" -- For Windows targets, we want to copy -- dxcompiler.dll, and dxil.dll from the Windows SDK redistributable @@ -915,7 +915,7 @@ tool "platform" addSourceDir "tools/platform/placeholder" -- Include windowing support on Windows. if isTargetWindows then - systemversion "10.0.14393.0" + systemversion "latest" else if enableXlib then defines { "SLANG_ENABLE_XLIB" } diff --git a/slang.sln b/slang.sln index fa9be6079..1551b7110 100644 --- a/slang.sln +++ b/slang.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 +# Visual Studio Version 16 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{FD47AE19-69FD-260F-F2F1-20E65EA61D13}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-test", "build\visual-studio\slang-test\slang-test.vcxproj", "{0C768A18-1D25-4000-9F37-DA5FE99E3B64}" -- cgit v1.2.3