80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Properly enable OpenAL by default

Browse Source
This commit is contained in:
David Hrdlička
2022-07-13 00:21:54 +02:00
parent 34006b4cd5
commit f70649af7c
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/cmake.yml vendored
View File

@@ -76,7 +76,7 @@ jobs:
${{ matrix.environment.prefix }}-zlib ${{ matrix.environment.prefix }}-zlib
${{ matrix.environment.prefix }}-libpng ${{ matrix.environment.prefix }}-libpng
${{ matrix.environment.prefix }}-libvncserver ${{ matrix.environment.prefix }}-libvncserver
${{ matrix.environment.prefix }}-rtmidi ${{ matrix.environment.prefix }}-openal
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Configure CMake - name: Configure CMake
run: >- run: >-
@@ -230,7 +230,7 @@ jobs:
librtmidi-dev librtmidi-dev
qtbase5-dev qtbase5-dev
qttools5-dev qttools5-dev
libfaudio-dev libopenal-dev
- name: Configure CMake - name: Configure CMake
run: >- run: >-
cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }} cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
@@ -271,7 +271,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install dependencies - 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 - name: Configure CMake
run: >- run: >-
PATH=/usr/local/opt/qt@5/bin:$PATH PATH=/usr/local/opt/qt@5/bin:$PATH

8
CMakeLists.txt
View File

@@ -18,12 +18,8 @@ cmake_minimum_required(VERSION 3.16)
cmake_policy(SET CMP0091 NEW) cmake_policy(SET CMP0091 NEW)
cmake_policy(SET CMP0079 NEW) cmake_policy(SET CMP0079 NEW)
# if(HAIKU)
# set(OPENAL ON)
# set(RTMIDI OFF)
# endif()
set(OPENAL ON)
if(HAIKU) if(HAIKU)
set(OPENAL ON)
set(RTMIDI OFF) set(RTMIDI OFF)
endif() endif()
@@ -131,7 +127,7 @@ set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
# ------ ----------- ---- # ------ ----------- ----
option(RELEASE "Release build" OFF) option(RELEASE "Release build" OFF)
option(DYNAREC "Dynamic recompiler" ON) option(DYNAREC "Dynamic recompiler" ON)
option(OPENAL "OpenAL" OFF) option(OPENAL "OpenAL" ON)
option(RTMIDI "RtMidi" ON) option(RTMIDI "RtMidi" ON)
option(FLUIDSYNTH "FluidSynth" ON) option(FLUIDSYNTH "FluidSynth" ON)
option(MUNT "MUNT" ON) option(MUNT "MUNT" ON)