wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

ci: Really use DXC 1.8.2502 for macOS.

Browse Source 
In theory commit 7b07d77396 already
did that, but in practice it ended up picking a commit from the
1.8.2405 branch, where a few of our tests fail. Since I hope to
soon enable DXC for macOS again, it's useful to fix that oversight.
This commit is contained in:
Giovanni Mascellani
2025-05-25 22:58:15 +02:00
committed by Henri Verbeet
parent 365f6d3be9
commit bb50117747
Notes: Henri Verbeet 2025-05-27 21:09:37 +02:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1517
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gitlab/image.yml
View File

@@ -41,12 +41,10 @@ image-mac:
- mkdir image/dxc - mkdir image/dxc
- mkdir image/moltenvk - mkdir image/moltenvk
# The specified commit includes an update to the DirectXShaderCompiler's - git clone --recursive --branch v1.8.2502 https://github.com/microsoft/DirectXShaderCompiler.git
# CMakeList.txt which makes it compatible with cmake (4+).
- git clone https://github.com/microsoft/DirectXShaderCompiler.git
- cd DirectXShaderCompiler - cd DirectXShaderCompiler
- git checkout 3035d316c35289b68e8fc9d8cf21d86a204fb0e2 # Include a fix for CMake 4+.
- git submodule update --init --recursive - git cherry-pick 3035d316c35289b68e8fc9d8cf21d86a204fb0e2
- mkdir build - mkdir build
- cd build - cd build
- cmake .. -C ../cmake/caches/PredefinedParams.cmake -D CMAKE_BUILD_TYPE=Release - cmake .. -C ../cmake/caches/PredefinedParams.cmake -D CMAKE_BUILD_TYPE=Release