Remove OpenAL from the build job dependencies

This commit is contained in:
David Hrdlička
2022-03-08 16:31:11 +01:00
parent c286829d90
commit 097a5fe0b9
4 changed files with 12 additions and 5 deletions

View File

@@ -46,7 +46,6 @@ jobs:
make make
${{ matrix.environment.prefix }}-gcc ${{ matrix.environment.prefix }}-gcc
${{ matrix.environment.prefix }}-pkg-config ${{ matrix.environment.prefix }}-pkg-config
${{ matrix.environment.prefix }}-openal
${{ matrix.environment.prefix }}-freetype ${{ matrix.environment.prefix }}-freetype
${{ matrix.environment.prefix }}-SDL2 ${{ matrix.environment.prefix }}-SDL2
${{ matrix.environment.prefix }}-zlib ${{ matrix.environment.prefix }}-zlib

View File

@@ -81,7 +81,6 @@ jobs:
${{ matrix.environment.prefix }}-ninja ${{ matrix.environment.prefix }}-ninja
${{ matrix.environment.prefix }}-cc ${{ matrix.environment.prefix }}-cc
${{ matrix.environment.prefix }}-pkg-config ${{ matrix.environment.prefix }}-pkg-config
${{ matrix.environment.prefix }}-openal
${{ matrix.environment.prefix }}-freetype ${{ matrix.environment.prefix }}-freetype
${{ matrix.environment.prefix }}-SDL2 ${{ matrix.environment.prefix }}-SDL2
${{ matrix.environment.prefix }}-zlib ${{ matrix.environment.prefix }}-zlib
@@ -254,7 +253,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install dependencies - name: Install dependencies
run: sudo apt update && sudo apt install gcc-11 g++-11 libfreetype-dev libsdl2-dev libpng-dev libopenal-dev libc6-dev librtmidi-dev qtbase5-dev qttools5-dev libfaudio-dev run: sudo apt update && sudo apt install gcc-11 g++-11 libfreetype-dev libsdl2-dev libpng-dev libc6-dev librtmidi-dev qtbase5-dev qttools5-dev libfaudio-dev
- name: Configure CMake - name: Configure CMake
run: >- run: >-
cmake -S . -B build cmake -S . -B build
@@ -318,7 +317,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install dependencies - name: Install dependencies
run: brew install freetype sdl2 libpng openal-soft rtmidi qt@5 faudio run: brew install freetype sdl2 libpng rtmidi qt@5 faudio
- name: Configure CMake - name: Configure CMake
run: >- run: >-
cmake -S . -B build cmake -S . -B build

View File

@@ -22,6 +22,10 @@ if(NOT DEFINED QT OR QT)
list(APPEND VCPKG_MANIFEST_FEATURES "qt-ui") list(APPEND VCPKG_MANIFEST_FEATURES "qt-ui")
endif() endif()
if(OPENAL)
list(APPEND VCPKG_MANIFEST_FEATURES "openal")
endif()
if(SLIRP_EXTERNAL) if(SLIRP_EXTERNAL)
list(APPEND VCPKG_MANIFEST_FEATURES "slirp") list(APPEND VCPKG_MANIFEST_FEATURES "slirp")
endif() endif()

View File

@@ -7,7 +7,6 @@
"dependencies": [ "dependencies": [
"freetype", "freetype",
"libpng", "libpng",
"openal-soft",
"sdl2", "sdl2",
"rtmidi" "rtmidi"
], ],
@@ -30,6 +29,12 @@
"dependencies": [ "dependencies": [
"libslirp" "libslirp"
] ]
},
"openal": {
"description": "OpenAL sound backend",
"dependencies": [
"openal-soft"
]
} }
} }
} }