archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 03:11:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #12310 from oltolm/update_cubeb

Browse source 
Externals: Update cubeb to mozilla/cubeb@54217bca3f
This commit is contained in:
Admiral H. Curtiss 2023-11-24 21:52:51 +01:00 committed by GitHub
commit d89a0423d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Externals/cubeb/CMakeLists.txt vendored
View file

@ -18,8 +18,9 @@ endif()
if (NOT MSVC) if (NOT MSVC)
set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD 99)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
endif() endif()
if(USE_SANITIZERS) if(USE_SANITIZERS)
@ -56,8 +57,8 @@ if(NOT MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -fno-exceptions -fno-rtti") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -fno-exceptions -fno-rtti")
else() else()
#string(REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable RTTI #string(REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # Disable RTTI
#string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable Exceptions #string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # Disable Exceptions
endif() endif()
add_library(cubeb add_library(cubeb
@ -157,6 +158,10 @@ if(LAZY_LOAD_LIBS)
if(USE_PULSE OR USE_ALSA OR USE_JACK OR USE_SNDIO OR USE_AAUDIO) if(USE_PULSE OR USE_ALSA OR USE_JACK OR USE_SNDIO OR USE_AAUDIO)
target_link_libraries(cubeb PRIVATE ${CMAKE_DL_LIBS}) target_link_libraries(cubeb PRIVATE ${CMAKE_DL_LIBS})
if(ANDROID)
target_compile_definitions(cubeb PRIVATE __ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__)
endif()
endif() endif()
else() else()
@ -262,7 +267,7 @@ endif()
check_include_files(SLES/OpenSLES.h USE_OPENSL) check_include_files(SLES/OpenSLES.h USE_OPENSL)
if(USE_OPENSL) if(USE_OPENSL)
target_sources(cubeb PRIVATE target_sources(cubeb PRIVATE
cubeb/src/cubeb_opensl.c cubeb/src/cubeb_opensl.cpp
cubeb/src/cubeb-jni.cpp) cubeb/src/cubeb-jni.cpp)
target_compile_definitions(cubeb PRIVATE USE_OPENSL) target_compile_definitions(cubeb PRIVATE USE_OPENSL)
target_link_libraries(cubeb PRIVATE OpenSLES) target_link_libraries(cubeb PRIVATE OpenSLES)

2
Externals/cubeb/cubeb vendored

@ -1 +1 @@
Subproject commit 27d2a102b0b75d9e49d43bc1ea516233fb87d778 Subproject commit 54217bca3f3e0cd53c073690a23dd25d83557909

1
Externals/cubeb/msvc/cubeb.vcxproj vendored
View file

@ -41,6 +41,7 @@
<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_tracing.h" />
<ClInclude Include="..\cubeb\src\cubeb_triple_buffer.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" />

1
Externals/cubeb/msvc/cubeb.vcxproj.filters vendored
View file

@ -12,6 +12,7 @@
<ClInclude Include="..\cubeb\src\cubeb_ring_array.h" /> <ClInclude Include="..\cubeb\src\cubeb_ring_array.h" />
<ClInclude Include="..\cubeb\src\cubeb_ringbuffer.h" /> <ClInclude Include="..\cubeb\src\cubeb_ringbuffer.h" />
<ClInclude Include="..\cubeb\src\cubeb_strings.h" /> <ClInclude Include="..\cubeb\src\cubeb_strings.h" />
<ClInclude Include="..\cubeb\src\cubeb_triple_buffer.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" />