diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-11-24 21:52:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-24 21:52:51 +0100 |
| commit | d89a0423d191931b31cafd8c2256a5258778dcb4 (patch) | |
| tree | 44d43016c21896a7a088c08acf09099d9c429e5f /Externals | |
| parent | afb4be1a903027170134d3fb30dd3b60142d4230 (diff) | |
| parent | 85133bbd8ebd41c15d3b474509d1f3042d47c825 (diff) | |
Merge pull request #12310 from oltolm/update_cubeb
Externals: Update cubeb to mozilla/cubeb@54217bca3f3e0cd53c073690a23dd25d83557909
Diffstat (limited to 'Externals')
| -rw-r--r-- | Externals/cubeb/CMakeLists.txt | 13 | ||||
| m--------- | Externals/cubeb/cubeb | 0 | ||||
| -rw-r--r-- | Externals/cubeb/msvc/cubeb.vcxproj | 1 | ||||
| -rw-r--r-- | Externals/cubeb/msvc/cubeb.vcxproj.filters | 1 |
4 files changed, 11 insertions, 4 deletions
diff --git a/Externals/cubeb/CMakeLists.txt b/Externals/cubeb/CMakeLists.txt index 07f4493dd9..e428d88e01 100644 --- a/Externals/cubeb/CMakeLists.txt +++ b/Externals/cubeb/CMakeLists.txt @@ -18,8 +18,9 @@ endif() if (NOT MSVC) set(CMAKE_C_STANDARD 99) - set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) endif() if(USE_SANITIZERS) @@ -56,8 +57,8 @@ if(NOT MSVC) 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") else() - #string(REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable RTTI - #string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable Exceptions + #string(REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # Disable RTTI + #string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # Disable Exceptions endif() 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) target_link_libraries(cubeb PRIVATE ${CMAKE_DL_LIBS}) + + if(ANDROID) + target_compile_definitions(cubeb PRIVATE __ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) + endif() endif() else() @@ -262,7 +267,7 @@ endif() check_include_files(SLES/OpenSLES.h USE_OPENSL) if(USE_OPENSL) target_sources(cubeb PRIVATE - cubeb/src/cubeb_opensl.c + cubeb/src/cubeb_opensl.cpp cubeb/src/cubeb-jni.cpp) target_compile_definitions(cubeb PRIVATE USE_OPENSL) target_link_libraries(cubeb PRIVATE OpenSLES) diff --git a/Externals/cubeb/cubeb b/Externals/cubeb/cubeb -Subproject 27d2a102b0b75d9e49d43bc1ea516233fb87d77 +Subproject 54217bca3f3e0cd53c073690a23dd25d8355790 diff --git a/Externals/cubeb/msvc/cubeb.vcxproj b/Externals/cubeb/msvc/cubeb.vcxproj index c35fd82128..9e054bbc3b 100644 --- a/Externals/cubeb/msvc/cubeb.vcxproj +++ b/Externals/cubeb/msvc/cubeb.vcxproj @@ -41,6 +41,7 @@ <ClInclude Include="..\cubeb\src\cubeb_ring_array.h" /> <ClInclude Include="..\cubeb\src\cubeb_strings.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_unix.h" /> <ClInclude Include="..\cubeb\src\cubeb_utils_win.h" /> diff --git a/Externals/cubeb/msvc/cubeb.vcxproj.filters b/Externals/cubeb/msvc/cubeb.vcxproj.filters index 8611fe88dc..fd366dbb06 100644 --- a/Externals/cubeb/msvc/cubeb.vcxproj.filters +++ b/Externals/cubeb/msvc/cubeb.vcxproj.filters @@ -12,6 +12,7 @@ <ClInclude Include="..\cubeb\src\cubeb_ring_array.h" /> <ClInclude Include="..\cubeb\src\cubeb_ringbuffer.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_unix.h" /> <ClInclude Include="..\cubeb\src\cubeb_utils_win.h" /> |