mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-23 16:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-0.12

Browse Source
This commit is contained in:
David Reid
2025-07-21 16:51:09 +10:00
parent 110ded6fc6 0b9f03a376
commit 377f589a01
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+11 -10
View File
@@ -61,6 +61,7 @@ option(MINIAUDIO_USE_STDINT "Use <stdint.h> for sized types"
option(MINIAUDIO_DEBUG_OUTPUT "Enable stdout debug output" OFF) option(MINIAUDIO_DEBUG_OUTPUT "Enable stdout debug output" OFF)
include(GNUInstallDirs)
# Construct compiler options. # Construct compiler options.
set(COMPILE_OPTIONS) set(COMPILE_OPTIONS)
@@ -155,6 +156,8 @@ if(MINIAUDIO_NO_PIPEWIRE)
list(APPEND COMPILE_DEFINES MA_NO_PIPEWIRE) list(APPEND COMPILE_DEFINES MA_NO_PIPEWIRE)
endif() endif()
if(MINIAUDIO_ENABLE_ONLY_SPECIFIC_BACKENDS) if(MINIAUDIO_ENABLE_ONLY_SPECIFIC_BACKENDS)
list(APPEND COMPILE_DEFINES MA_ENABLE_ONLY_SPECIFIC_BACKENDS)
if(MINIAUDIO_ENABLE_WASAPI) if(MINIAUDIO_ENABLE_WASAPI)
list(APPEND COMPILE_DEFINES MA_ENABLE_WASAPI) list(APPEND COMPILE_DEFINES MA_ENABLE_WASAPI)
endif() endif()
@@ -474,13 +477,13 @@ endif()
# Static Libraries # Static Libraries
add_library(miniaudio STATIC add_library(miniaudio
miniaudio.c miniaudio.c
miniaudio.h miniaudio.h
) )
list(APPEND LIBS_TO_INSTALL miniaudio) list(APPEND LIBS_TO_INSTALL miniaudio)
install(FILES miniaudio.h DESTINATION include/miniaudio) install(FILES miniaudio.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/miniaudio)
target_include_directories(miniaudio PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(miniaudio PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_options (miniaudio PRIVATE ${COMPILE_OPTIONS}) target_compile_options (miniaudio PRIVATE ${COMPILE_OPTIONS})
@@ -515,13 +518,13 @@ if(HAS_LIBVORBIS)
endif() endif()
if(HAS_LIBVORBIS) if(HAS_LIBVORBIS)
add_library(miniaudio_libvorbis STATIC add_library(miniaudio_libvorbis
extras/decoders/libvorbis/miniaudio_libvorbis.c extras/decoders/libvorbis/miniaudio_libvorbis.c
extras/decoders/libvorbis/miniaudio_libvorbis.h extras/decoders/libvorbis/miniaudio_libvorbis.h
) )
list(APPEND LIBS_TO_INSTALL miniaudio_libvorbis) list(APPEND LIBS_TO_INSTALL miniaudio_libvorbis)
install(FILES extras/decoders/libvorbis/miniaudio_libvorbis.h DESTINATION include/miniaudio/extras/decoders/libvorbis) install(FILES extras/decoders/libvorbis/miniaudio_libvorbis.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/miniaudio/extras/decoders/libvorbis)
target_compile_options (miniaudio_libvorbis PRIVATE ${COMPILE_OPTIONS}) target_compile_options (miniaudio_libvorbis PRIVATE ${COMPILE_OPTIONS})
target_compile_definitions(miniaudio_libvorbis PRIVATE ${COMPILE_DEFINES}) target_compile_definitions(miniaudio_libvorbis PRIVATE ${COMPILE_DEFINES})
@@ -539,14 +542,14 @@ if(HAS_LIBOPUS)
endif() endif()
if(HAS_LIBOPUS) if(HAS_LIBOPUS)
add_library(miniaudio_libopus STATIC add_library(miniaudio_libopus
extras/decoders/libopus/miniaudio_libopus.c extras/decoders/libopus/miniaudio_libopus.c
extras/decoders/libopus/miniaudio_libopus.h extras/decoders/libopus/miniaudio_libopus.h
) )
list(APPEND LIBS_TO_INSTALL miniaudio_libopus) list(APPEND LIBS_TO_INSTALL miniaudio_libopus)
install(FILES extras/decoders/libopus/miniaudio_libopus.h DESTINATION include/miniaudio/extras/decoders/libopus) install(FILES extras/decoders/libopus/miniaudio_libopus.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/miniaudio/extras/decoders/libopus)
target_compile_options (miniaudio_libopus PRIVATE ${COMPILE_OPTIONS}) target_compile_options (miniaudio_libopus PRIVATE ${COMPILE_OPTIONS})
target_compile_definitions(miniaudio_libopus PRIVATE ${COMPILE_DEFINES}) target_compile_definitions(miniaudio_libopus PRIVATE ${COMPILE_DEFINES})
@@ -556,7 +559,7 @@ endif()
if(NOT MINIAUDIO_NO_EXTRA_NODES) if(NOT MINIAUDIO_NO_EXTRA_NODES)
function(add_extra_node name) function(add_extra_node name)
add_library(miniaudio_${name}_node STATIC add_library(miniaudio_${name}_node
extras/nodes/ma_${name}_node/ma_${name}_node.c extras/nodes/ma_${name}_node/ma_${name}_node.c
extras/nodes/ma_${name}_node/ma_${name}_node.h extras/nodes/ma_${name}_node/ma_${name}_node.h
) )
@@ -565,7 +568,7 @@ if(NOT MINIAUDIO_NO_EXTRA_NODES)
list(APPEND libs miniaudio_${name}_node) list(APPEND libs miniaudio_${name}_node)
set(LIBS_TO_INSTALL "${libs}" PARENT_SCOPE) # without PARENT_SCOPE, any changes are lost set(LIBS_TO_INSTALL "${libs}" PARENT_SCOPE) # without PARENT_SCOPE, any changes are lost
install(FILES extras/nodes/ma_${name}_node/ma_${name}_node.h DESTINATION include/miniaudio/extras/nodes/ma_${name}_node) install(FILES extras/nodes/ma_${name}_node/ma_${name}_node.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/miniaudio/extras/nodes/ma_${name}_node)
target_include_directories(miniaudio_${name}_node PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/extras/nodes/ma_${name}_node) target_include_directories(miniaudio_${name}_node PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/extras/nodes/ma_${name}_node)
target_compile_options (miniaudio_${name}_node PRIVATE ${COMPILE_OPTIONS}) target_compile_options (miniaudio_${name}_node PRIVATE ${COMPILE_OPTIONS})
@@ -714,8 +717,6 @@ if (MINIAUDIO_BUILD_EXAMPLES)
add_miniaudio_example(miniaudio_simple_spatialization simple_spatialization.c) add_miniaudio_example(miniaudio_simple_spatialization simple_spatialization.c)
endif() endif()
include(GNUInstallDirs)
message(STATUS "Library list: ${LIBS_TO_INSTALL}") message(STATUS "Library list: ${LIBS_TO_INSTALL}")
install(TARGETS ${LIBS_TO_INSTALL} install(TARGETS ${LIBS_TO_INSTALL}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}