Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade codebase to C++ 20 + fix warnings + update submodules (#6115)

Browse source
This commit is contained in:
GPUCode 2022-09-21 19:36:12 +03:00 • committed by GitHub
parent 90b418fd1a
commit cbd5d1c15c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
67 changed files with 6837 additions and 7475 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/audio_core/CMakeLists.txt
View file

@ -29,7 +29,7 @@ add_library(audio_core STATIC
time_stretch.cpp
time_stretch.h
$<$<BOOL:${SDL2_FOUND}>:sdl2_sink.cpp sdl2_sink.h>
$<$<BOOL:${ENABLE_SDL2}>:sdl2_sink.cpp sdl2_sink.h>
$<$<BOOL:${ENABLE_CUBEB}>:cubeb_sink.cpp cubeb_sink.h cubeb_input.cpp cubeb_input.h>
)
@ -37,6 +37,7 @@ create_target_directory_groups(audio_core)
target_link_libraries(audio_core PUBLIC common)
target_link_libraries(audio_core PRIVATE SoundTouch teakra)
set_target_properties(audio_core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})
if(ENABLE_MF)
target_sources(audio_core PRIVATE
@ -79,8 +80,8 @@ if(ANDROID)
target_link_libraries(audio_core PRIVATE mediandk)
endif()
if(SDL2_FOUND)
target_link_libraries(audio_core PRIVATE SDL2)
if(ENABLE_SDL2)
target_link_libraries(audio_core PRIVATE SDL2::SDL2)
target_compile_definitions(audio_core PRIVATE HAVE_SDL2)
endif()

3
src/audio_core/hle/wmf_decoder_utils.h
View file

@ -3,9 +3,6 @@
// Refer to the license.txt file included.
#pragma once
// AAC decoder related APIs are only available with WIN7+
#define WINVER _WIN32_WINNT_WIN7
#include <optional>
#include <string>
#include <tuple>

2
src/audio_core/lle/lle.cpp
View file

@ -450,7 +450,7 @@ void DspLle::SetServiceToInterrupt(std::weak_ptr<Service::DSP::DSP_DSP> dsp) {
return;
if (pipe == 0) {
// pipe 0 is for debug. 3DS automatically drains this pipe and discards the data
impl->ReadPipe(pipe, impl->GetPipeReadableSize(pipe));
impl->ReadPipe(static_cast<u8>(pipe), impl->GetPipeReadableSize(pipe));
} else {
std::lock_guard lock(HLE::g_hle_lock);
if (auto locked = dsp.lock()) {