diff --git a/.github/workflows/scripts/windows/build-dependencies.bat b/.github/workflows/scripts/windows/build-dependencies.bat index 01d041b963..17a360befe 100755 --- a/.github/workflows/scripts/windows/build-dependencies.bat +++ b/.github/workflows/scripts/windows/build-dependencies.bat @@ -93,6 +93,7 @@ set SHADERC_SPIRVTOOLS=6337eb62cadd7d124ac6789bf39c0f71148f0a73 set AGILITYSDK=1.619.2 set DXHEADERS=1.619.1 +set DXC=1.9.2607.13 call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 8f8c16703a8170b235361aacdf0ec97d2445ae4e3e3d127eb1576f498269ef79 || goto error call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" a303149d7b9f087d788135e9733fdac8e4cec694e5afc04bf33e10a516b33282 || goto error @@ -127,6 +128,7 @@ call :downloadfile "plutovg-%PLUTOVG%.zip" "https://github.com/sammycage/plutovg call :downloadfile "plutosvg-%PLUTOSVG%.zip" "https://github.com/sammycage/plutosvg/archive/v%PLUTOSVG%.zip" 82dee2c57ad712bdd6d6d81d3e76249d89caa4b5a4214353660fd5adff12201a || goto error call :downloadfile "agility-sdk-%AGILITYSDK%.nupkg" "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/%AGILITYSDK%" eb92d90bb23b2ec23410c41d791e41dbdbec942ab946924d1fdcb31eac6f0735 || goto error call :downloadfile "DirectX-Headers-%DXHEADERS%.zip" "https://github.com/microsoft/DirectX-Headers/archive/v%DXHEADERS%.zip" 9eb8b102a90a42e4ea72a825f7d249d55ec90d164f030966c9b7784b93374927 || goto error +call :downloadfile "DirectXShaderCompiler-%DXC%.nupkg" "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.DXC/%DXC%" 5d6acd23089b2979a3c1d39b7e31227da989a47b5d9f3db57111ad4717ea537e || goto error call :downloadfile "rapidyaml-%RAPIDYAML%-src.zip" "https://github.com/biojppm/rapidyaml/releases/download/v%RAPIDYAML%/rapidyaml-%RAPIDYAML%-src.zip" 96276f55b9fa7837ac8f3f72fd52965879cbb5d5d2e6af548c69a177fb078304 || goto error call :downloadfile "shaderc-%SHADERC%.zip" "https://github.com/google/shaderc/archive/refs/tags/v%SHADERC%.zip" f9401cc5cb36c276cd1e072b6595dbd728148e8dba389e50f7339e2d388dbc08 || goto error @@ -517,6 +519,14 @@ cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error +echo Unpacking DirectX Shader Compiler +rmdir /S /Q "DirectXShaderCompiler-%DXC%" +%SEVENZIP% x -o"DirectXShaderCompiler-%DXC%" "DirectXShaderCompiler-%DXC%.nupkg" || goto error +cd "DirectXShaderCompiler-%DXC%" || goto error +copy "build\native\lib\x64\dxcompiler.lib" "%INSTALLDIR%\lib\dxcompiler.lib" || goto error +copy "build\native\bin\x64\dxcompiler.dll" "%INSTALLDIR%\bin\dxcompiler.dll" || goto error +cd .. || goto error + echo Building shaderc... rmdir /S /Q "shaderc-%SHADERC%" %SEVENZIP% x "shaderc-%SHADERC%.zip" || goto error diff --git a/bin/docs/ThirdPartyLicenses.html b/bin/docs/ThirdPartyLicenses.html index dd4ac33d06..7de609cdbb 100644 --- a/bin/docs/ThirdPartyLicenses.html +++ b/bin/docs/ThirdPartyLicenses.html @@ -12,6 +12,7 @@
  • cubeb
  • D3D12 Memory Allocator
  • Dear ImGui
  • +
  • DirectX Shader Compiler
  • Discord-RPC
  • fast_float
  • FFmpeg
  • @@ -186,6 +187,55 @@ SOFTWARE. +
    +

    DirectX Shader Compiler - https://github.com/microsoft/directxshadercompiler

    +
    +==============================================================================
    +LLVM Release License
    +==============================================================================
    +University of Illinois/NCSA
    +Open Source License
    +
    +Copyright (c) 2003-2015 University of Illinois at Urbana-Champaign.
    +All rights reserved.
    +
    +Developed by:
    +
    +    LLVM Team
    +
    +    University of Illinois at Urbana-Champaign
    +
    +    http://llvm.org
    +
    +Permission is hereby granted, free of charge, to any person obtaining a copy of
    +this software and associated documentation files (the "Software"), to deal with
    +the Software without restriction, including without limitation the rights to
    +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
    +of the Software, and to permit persons to whom the Software is furnished to do
    +so, subject to the following conditions:
    +
    +    * Redistributions of source code must retain the above copyright notice,
    +      this list of conditions and the following disclaimers.
    +
    +    * Redistributions in binary form must reproduce the above copyright notice,
    +      this list of conditions and the following disclaimers in the
    +      documentation and/or other materials provided with the distribution.
    +
    +    * Neither the names of the LLVM Team, University of Illinois at
    +      Urbana-Champaign, nor the names of its contributors may be used to
    +      endorse or promote products derived from this Software without specific
    +      prior written permission.
    +
    +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
    +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
    +CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
    +SOFTWARE.
    +
    +
    +

    Discord-RPC - https://github.com/discord/discord-rpc