diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 51e2acbeb..6d13f5b72 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -46,7 +46,6 @@ jobs: make ${{ matrix.environment.prefix }}-gcc ${{ matrix.environment.prefix }}-pkg-config - ${{ matrix.environment.prefix }}-openal ${{ matrix.environment.prefix }}-freetype ${{ matrix.environment.prefix }}-SDL2 ${{ matrix.environment.prefix }}-zlib diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 1e359379b..7202583cb 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -81,7 +81,6 @@ jobs: ${{ matrix.environment.prefix }}-ninja ${{ matrix.environment.prefix }}-cc ${{ matrix.environment.prefix }}-pkg-config - ${{ matrix.environment.prefix }}-openal ${{ matrix.environment.prefix }}-freetype ${{ matrix.environment.prefix }}-SDL2 ${{ matrix.environment.prefix }}-zlib @@ -254,7 +253,7 @@ jobs: steps: - uses: actions/checkout@v2 - 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 run: >- cmake -S . -B build @@ -318,7 +317,7 @@ jobs: steps: - uses: actions/checkout@v2 - 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 run: >- cmake -S . -B build diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d9ee9d41..24a3413b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,10 @@ if(NOT DEFINED QT OR QT) list(APPEND VCPKG_MANIFEST_FEATURES "qt-ui") endif() +if(OPENAL) + list(APPEND VCPKG_MANIFEST_FEATURES "openal") +endif() + if(SLIRP_EXTERNAL) list(APPEND VCPKG_MANIFEST_FEATURES "slirp") endif() diff --git a/vcpkg.json b/vcpkg.json index 2e01d1c1f..9dcecfe5e 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -7,7 +7,6 @@ "dependencies": [ "freetype", "libpng", - "openal-soft", "sdl2", "rtmidi" ], @@ -30,6 +29,12 @@ "dependencies": [ "libslirp" ] + }, + "openal": { + "description": "OpenAL sound backend", + "dependencies": [ + "openal-soft" + ] } } }