From f70649af7c2e0c8b599d736c6f776cd4aa2130ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Wed, 13 Jul 2022 00:21:54 +0200 Subject: [PATCH] Properly enable OpenAL by default --- .github/workflows/cmake.yml | 6 +++--- CMakeLists.txt | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 112a54283..c6ac100f7 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -76,7 +76,7 @@ jobs: ${{ matrix.environment.prefix }}-zlib ${{ matrix.environment.prefix }}-libpng ${{ matrix.environment.prefix }}-libvncserver - ${{ matrix.environment.prefix }}-rtmidi + ${{ matrix.environment.prefix }}-openal - uses: actions/checkout@v2 - name: Configure CMake run: >- @@ -230,7 +230,7 @@ jobs: librtmidi-dev qtbase5-dev qttools5-dev - libfaudio-dev + libopenal-dev - name: Configure CMake run: >- cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }} @@ -271,7 +271,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Install dependencies - run: brew install freetype sdl2 libpng rtmidi qt@5 faudio ninja + run: brew install freetype sdl2 libpng rtmidi qt@5 openal-soft ninja - name: Configure CMake run: >- PATH=/usr/local/opt/qt@5/bin:$PATH diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b393f41a..b78e4efe4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,12 +18,8 @@ cmake_minimum_required(VERSION 3.16) cmake_policy(SET CMP0091 NEW) cmake_policy(SET CMP0079 NEW) -# if(HAIKU) - # set(OPENAL ON) - # set(RTMIDI OFF) -# endif() -set(OPENAL ON) if(HAIKU) + set(OPENAL ON) set(RTMIDI OFF) endif() @@ -131,7 +127,7 @@ set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON) # ------ ----------- ---- option(RELEASE "Release build" OFF) option(DYNAREC "Dynamic recompiler" ON) -option(OPENAL "OpenAL" OFF) +option(OPENAL "OpenAL" ON) option(RTMIDI "RtMidi" ON) option(FLUIDSYNTH "FluidSynth" ON) option(MUNT "MUNT" ON)