claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added library on CMAKE

Browse Source
This commit is contained in:
Jose Phillips
2024-12-01 20:33:51 -05:00
parent 7f8a34990c
commit 04db328bf3
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/cmake_macos.yml vendored
View File

@@ -103,6 +103,7 @@ jobs:
-D Qt5_ROOT=$(brew --prefix qt@5) -D Qt5_ROOT=$(brew --prefix qt@5)
-D Qt5LinguistTools_ROOT=$(brew --prefix qt@5) -D Qt5LinguistTools_ROOT=$(brew --prefix qt@5)
-D OpenAL_ROOT=$(brew --prefix openal-soft) -D OpenAL_ROOT=$(brew --prefix openal-soft)
-D LIBSERIALPORT_ROOT=$(brew --prefix libserialport)
- name: Build - name: Build
run: | run: |
@@ -182,6 +183,7 @@ jobs:
openal-soft openal-soft
fluidsynth fluidsynth
libslirp libslirp
libserialport
${{ matrix.ui.packages }} ${{ matrix.ui.packages }}
- name: Checkout repository - name: Checkout repository
@@ -202,6 +204,7 @@ jobs:
-D Qt5_ROOT=$(brew --prefix qt@5) -D Qt5_ROOT=$(brew --prefix qt@5)
-D Qt5LinguistTools_ROOT=$(brew --prefix qt@5) -D Qt5LinguistTools_ROOT=$(brew --prefix qt@5)
-D OpenAL_ROOT=$(brew --prefix openal-soft) -D OpenAL_ROOT=$(brew --prefix openal-soft)
-D LIBSERIALPORT_ROOT=$(brew --prefix libserialport)
- name: Build - name: Build
run: | run: |

1
.github/workflows/codeql_macos.yml vendored
View File

@@ -98,6 +98,7 @@ jobs:
-D Qt5_ROOT=$(brew --prefix qt@5) -D Qt5_ROOT=$(brew --prefix qt@5)
-D Qt5LinguistTools_ROOT=$(brew --prefix qt@5) -D Qt5LinguistTools_ROOT=$(brew --prefix qt@5)
-D OpenAL_ROOT=$(brew --prefix openal-soft) -D OpenAL_ROOT=$(brew --prefix openal-soft)
-D LIBSERIALPORT_ROOT=$(brew --prefix libserialport)
- name: Build - name: Build
run: cmake --build build run: cmake --build build

4
CMakePresets.json
View File

@@ -68,7 +68,8 @@
"Qt5_DIR": "/opt/homebrew/opt/qt@5/lib/cmake/Qt5", "Qt5_DIR": "/opt/homebrew/opt/qt@5/lib/cmake/Qt5",
"MOLTENVK_DIR": "/opt/homebrew/opt/molten-vk", "MOLTENVK_DIR": "/opt/homebrew/opt/molten-vk",
"Qt5LinguistTools_DIR": "/opt/homebrew/opt/qt@5/lib/cmake/Qt5LinguistTools", "Qt5LinguistTools_DIR": "/opt/homebrew/opt/qt@5/lib/cmake/Qt5LinguistTools",
"OpenAL_ROOT": "/opt/homebrew/opt/openal-soft" "OpenAL_ROOT": "/opt/homebrew/opt/openal-soft",
"LIBSERIALPORT_ROOT": "/opt/homebrew/opt/libserialport"
}, },
"inherits": "regular" "inherits": "regular"
}, },
@@ -86,6 +87,7 @@
"MOLTENVK_DIR": "/opt/homebrew/opt/molten-vk", "MOLTENVK_DIR": "/opt/homebrew/opt/molten-vk",
"Qt5LinguistTools_DIR": "/opt/homebrew/opt/qt@5/lib/cmake/Qt5LinguistTools", "Qt5LinguistTools_DIR": "/opt/homebrew/opt/qt@5/lib/cmake/Qt5LinguistTools",
"OpenAL_ROOT": "/opt/homebrew/opt/openal-soft", "OpenAL_ROOT": "/opt/homebrew/opt/openal-soft",
"LIBSERIALPORT_ROOT": "/opt/homebrew/opt/libserialport",
"CMAKE_CXX_FLAGS_DEBUG": "-g -O0 -DENABLE_VDE_LOG", "CMAKE_CXX_FLAGS_DEBUG": "-g -O0 -DENABLE_VDE_LOG",
"CMAKE_C_FLAGS_DEBUG": "-g -O0 -DENABLE_VDE_LOG" "CMAKE_C_FLAGS_DEBUG": "-g -O0 -DENABLE_VDE_LOG"
}, },

5
src/sound/sound.c
View File

@@ -153,11 +153,6 @@ static const SOUND_CARD sound_cards[] = {
{ &ct5880_device }, { &ct5880_device },
{ &ad1881_device }, { &ad1881_device },
{ &cs4297a_device }, { &cs4297a_device },
{ &ess_688_device },
{ &ess_ess0100_pnp_device },
{ &ess_1688_device },
{ &ess_ess0102_pnp_device },
{ &ess_ess0968_pnp_device },
{ &opl2board_device }, { &opl2board_device },
{ NULL } { NULL }
// clang-format on // clang-format on