Skip to content

Commit

Permalink
Disable vulkan on mac and fix paths
Browse files Browse the repository at this point in the history
  • Loading branch information
Dextinfire committed Sep 8, 2024
1 parent 73cae02 commit 9b7601e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,11 @@ jobs:

- name: Copy docs
run: |
cp THIRDPARTY.md README.md LICENSE "${{ github.workspace }}/release/ci-Release"
cp THIRDPARTY.md README.md LICENSE "${{ github.workspace }}/release/ci-release"
shell: bash

- name: Archive Artifacts
run: |
7z u impacto-${{ matrix.os_name }}-${{ needs.get_version.outputs.version }}-${{ github.sha }}.zip release/ci-Release/*
7z u impacto-${{ matrix.os_name }}-${{ needs.get_version.outputs.version }}-${{ github.sha }}.zip release/ci-release/*
# if: startsWith(github.ref, 'refs/tags') || (github.ref == 'refs/heads/master')
- name: Upload Artifact
uses: actions/[email protected]
Expand Down Expand Up @@ -164,8 +163,9 @@ jobs:
runs-on: ubuntu-22.04
needs:
- job-matrix

if: always() && contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
steps:
- uses: actions/checkout@v2
- name: 'Get Jobs Status'
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -633,12 +633,12 @@ if (WIN32)
)
endif ()

if (NX OR EMSCRIPTEN)
if (NX OR EMSCRIPTEN OR APPLE)
set(IMPACTO_DISABLE_VULKAN ON)
set(IMPACTO_DISABLE_DX9 ON)
endif ()

if (APPLE OR LINUX)
if (LINUX)
set(IMPACTO_DISABLE_DX9 ON)
endif ()

Expand Down
10 changes: 7 additions & 3 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"builtin-baseline": "0f88ecb8528605f91980b90a2c5bad88e3cb565f",
"dependencies": [
"sdl2",
{
"name": "sdl2",
"default-features": true,
"features": [
"vulkan"
]
],
"platform": "!osx"
},
{
"name": "vulkan",
"platform": "!osx"
},
"vulkan",
"openal-soft",
"libogg",
"libvorbis",
Expand Down

0 comments on commit 9b7601e

Please sign in to comment.