diff --git a/gitlab/build.yml b/gitlab/build.yml index 56bf33bc..feed0ff6 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -147,7 +147,7 @@ build-mac: tags: - mac script: - - brew install vulkan-tools libtool spirv-headers vulkan-loader + - brew install vulkan-tools libtool spirv-headers vulkan-loader mingw-w64 - git config --global --add safe.directory $CI_PROJECT_DIR - git clean -fdx - git reset --hard @@ -155,7 +155,7 @@ build-mac: - curl -o image.zip https://gitlab.winehq.org/api/v4/projects/wine%2Fvkd3d/jobs/artifacts/master/download?job=image-mac - unzip image.zip - mkdir artifacts - - export PATH="/opt/homebrew/opt/bison/bin:/opt/homebrew/opt/flex/bin:$PWD/image/bin:$PATH" + - export PATH="/opt/homebrew/opt/bison/bin:/opt/homebrew/opt/flex/bin:$PATH" - export VK_DRIVER_FILES="$PWD/image/moltenvk/MoltenVK_icd.json" - system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt - vulkaninfo > artifacts/vulkaninfo.txt @@ -167,6 +167,7 @@ build-mac: VKD3D_SHADER_CONFIG: 'force_validation' MVK_CONFIG_LOG_LEVEL: 2 SONAME_LIBVULKAN: "/opt/homebrew/opt/vulkan-loader/lib/libvulkan.1.dylib" + WIDL: "x86_64-w64-mingw32-widl" artifacts: when: always paths: