Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-10 05:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

make a bit more mergeable

Browse source
This commit is contained in:
lizzie 2026-01-24 20:02:12 +00:00
parent fa0d0a9ba0
commit d365a3050a
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.ci/ps4/build.sh
View file

@ -52,6 +52,7 @@ cmake -S . -B build -G "Unix Makefiles" \
-DCPMUTIL_FORCE_BUNDLED=ON \ -DCPMUTIL_FORCE_BUNDLED=ON \
-DYUZU_USE_EXTERNAL_FFMPEG=ON \ -DYUZU_USE_EXTERNAL_FFMPEG=ON \
-DYUZU_USE_CPM=ON \ -DYUZU_USE_CPM=ON \
-DDYNARMIC_ENABLE_NO_EXECUTE_SUPPORT=OFF \
-DDYNARMIC_TESTS=ON \ -DDYNARMIC_TESTS=ON \
-DYUZU_USE_EXTERNAL_SDL2=ON \ -DYUZU_USE_EXTERNAL_SDL2=ON \
"${EXTRA_CMAKE_FLAGS[@]}" || exit "${EXTRA_CMAKE_FLAGS[@]}" || exit

2
src/audio_core/CMakeLists.txt
View file

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project # SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# SPDX-FileCopyrightText: 2018 yuzu Emulator Project # SPDX-FileCopyrightText: 2018 yuzu Emulator Project

3
src/hid_core/resources/npad/npad.cpp
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@ -1340,6 +1340,7 @@ void NPad::UpdateHandheldAbstractState() {
void NPad::EnableAppletToGetInput(u64 aruid) { void NPad::EnableAppletToGetInput(u64 aruid) {
std::scoped_lock lock{mutex}; std::scoped_lock lock{mutex};
std::scoped_lock shared_lock{*applet_resource_holder.shared_mutex}; std::scoped_lock shared_lock{*applet_resource_holder.shared_mutex};
for (auto& abstract_pad : abstracted_pads) { for (auto& abstract_pad : abstracted_pads) {
abstract_pad.EnableAppletToGetInput(aruid); abstract_pad.EnableAppletToGetInput(aruid);
} }