ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Externals: Update cubeb to mozilla/cubeb@27d2a102b0.

This commit is contained in:
Admiral H. Curtiss 2022-11-26 05:08:27 +01:00
parent e085bf14f9
commit 49252a0217
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Externals/cubeb/CMakeLists.txt vendored
View File

@ -125,7 +125,7 @@ if(NOT BUNDLE_SPEEX)
endif() endif()
if(NOT TARGET speex) if(NOT TARGET speex)
add_library(speex STATIC cubeb/subprojects/speex/resample.c) add_library(speex OBJECT cubeb/subprojects/speex/resample.c)
dolphin_disable_warnings_msvc(speex) dolphin_disable_warnings_msvc(speex)
set_target_properties(speex PROPERTIES POSITION_INDEPENDENT_CODE TRUE) set_target_properties(speex PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
target_include_directories(speex INTERFACE cubeb/subprojects) target_include_directories(speex INTERFACE cubeb/subprojects)
@ -273,9 +273,22 @@ if(HAVE_SYS_SOUNDCARD_H)
try_compile(USE_OSS "${PROJECT_BINARY_DIR}/compile_tests" try_compile(USE_OSS "${PROJECT_BINARY_DIR}/compile_tests"
${PROJECT_SOURCE_DIR}/cubeb/cmake/compile_tests/oss_is_v4.c) ${PROJECT_SOURCE_DIR}/cubeb/cmake/compile_tests/oss_is_v4.c)
if(USE_OSS) if(USE_OSS)
target_sources(cubeb PRIVATE # strlcpy is not available on BSD systems that use glibc,
cubeb/src/cubeb_oss.c) # like Debian kfreebsd, so try using libbsd if available
target_compile_definitions(cubeb PRIVATE USE_OSS) include(CheckSymbolExists)
check_symbol_exists(strlcpy string.h HAVE_STRLCPY)
if(NOT HAVE_STRLCPY)
pkg_check_modules(libbsd-overlay IMPORTED_TARGET libbsd-overlay)
if(libbsd-overlay_FOUND)
target_link_libraries(cubeb PRIVATE PkgConfig::libbsd-overlay)
set(HAVE_STRLCPY true)
endif()
endif()
if (HAVE_STRLCPY)
target_sources(cubeb PRIVATE
cubeb/src/cubeb_oss.c)
target_compile_definitions(cubeb PRIVATE USE_OSS)
endif()
endif() endif()
endif() endif()
@ -339,13 +352,3 @@ if(USE_AUDIOUNIT AND USE_AUDIOUNIT_RUST)
debug "${PROJECT_SOURCE_DIR}/cubeb/src/cubeb-coreaudio-rs/target/debug/libcubeb_coreaudio.a" debug "${PROJECT_SOURCE_DIR}/cubeb/src/cubeb-coreaudio-rs/target/debug/libcubeb_coreaudio.a"
optimized "${PROJECT_SOURCE_DIR}/cubeb/src/cubeb-coreaudio-rs/target/release/libcubeb_coreaudio.a") optimized "${PROJECT_SOURCE_DIR}/cubeb/src/cubeb-coreaudio-rs/target/release/libcubeb_coreaudio.a")
endif() endif()
find_package(Doxygen)
if(DOXYGEN_FOUND)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/docs/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/docs/Doxyfile @ONLY)
add_custom_target(doc ALL
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/docs/Doxyfile
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docs
COMMENT "Generating API documentation with Doxygen" VERBATIM)
endif()

2
Externals/cubeb/cubeb vendored

@ -1 +1 @@
Subproject commit 773f16b7ea308392c05be3e290163d1f636e6024 Subproject commit 27d2a102b0b75d9e49d43bc1ea516233fb87d778

2
Externals/cubeb/msvc/cubeb.vcxproj vendored
View File

@ -40,13 +40,13 @@
<ClInclude Include="..\cubeb\src\cubeb_ringbuffer.h" /> <ClInclude Include="..\cubeb\src\cubeb_ringbuffer.h" />
<ClInclude Include="..\cubeb\src\cubeb_ring_array.h" /> <ClInclude Include="..\cubeb\src\cubeb_ring_array.h" />
<ClInclude Include="..\cubeb\src\cubeb_strings.h" /> <ClInclude Include="..\cubeb\src\cubeb_strings.h" />
<ClInclude Include="..\cubeb\src\cubeb_tracing.h" />
<ClInclude Include="..\cubeb\src\cubeb_utils.h" /> <ClInclude Include="..\cubeb\src\cubeb_utils.h" />
<ClInclude Include="..\cubeb\src\cubeb_utils_unix.h" /> <ClInclude Include="..\cubeb\src\cubeb_utils_unix.h" />
<ClInclude Include="..\cubeb\src\cubeb_utils_win.h" /> <ClInclude Include="..\cubeb\src\cubeb_utils_win.h" />
<ClInclude Include="..\cubeb\src\cubeb-internal.h" /> <ClInclude Include="..\cubeb\src\cubeb-internal.h" />
<ClInclude Include="..\cubeb\src\cubeb-jni.h" /> <ClInclude Include="..\cubeb\src\cubeb-jni.h" />
<ClInclude Include="..\cubeb\src\cubeb-jni-instances.h" /> <ClInclude Include="..\cubeb\src\cubeb-jni-instances.h" />
<ClInclude Include="..\cubeb\src\cubeb-sles.h" />
<ClInclude Include="..\cubeb\src\cubeb-speex-resampler.h" /> <ClInclude Include="..\cubeb\src\cubeb-speex-resampler.h" />
<ClInclude Include="..\cubeb\subprojects\speex\arch.h" /> <ClInclude Include="..\cubeb\subprojects\speex\arch.h" />
<ClInclude Include="..\cubeb\subprojects\speex\fixed_generic.h" /> <ClInclude Include="..\cubeb\subprojects\speex\fixed_generic.h" />