Compare commits

...

2 Commits

Author SHA1 Message Date
John de7e6e01d4 Revert [input_common/joycon] Enumerate SDL devices iff SDL signals change (#4486) (#4545)
Due to causing the platform windows to crash when a controller is activated.

- [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions).
- [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md).
- [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability.

-------------------

Co-authored-by: Your Name <John@John.localdomain>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4545
Reviewed-by: lizzie <lizzie@eden-emu.dev>
Reviewed-by: Maufeat <sahyno1996@gmail.com>
2026-10-18 00:17:28 +02:00
crueter e0d47f2790 [cmake] fix macOS compilation by forcing lz4 to be static (#4540)
Signed-off-by: crueter <crueter@eden-emu.dev>

- [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions).
- [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md).
- [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability.

-------------------

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4540
2026-10-16 21:41:11 +02:00
2 changed files with 12 additions and 13 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ else()
endif() endif()
if (lz4_FOUND AND NOT TARGET lz4::lz4) if (lz4_FOUND AND NOT TARGET lz4::lz4)
if (TARGET LZ4::lz4_shared) if (TARGET LZ4::lz4_shared AND NOT YUZU_STATIC_BUILD)
add_library(lz4::lz4 ALIAS LZ4::lz4_shared) add_library(lz4::lz4 ALIAS LZ4::lz4_shared)
elseif (TARGET LZ4::lz4_static) elseif (TARGET LZ4::lz4_static)
add_library(lz4::lz4 ALIAS LZ4::lz4_static) add_library(lz4::lz4 ALIAS LZ4::lz4_static)
+11 -12
View File
@@ -83,21 +83,20 @@ void Joycons::ScanThread(std::stop_token stop_token) {
constexpr u16 nintendo_vendor_id = 0x057e; constexpr u16 nintendo_vendor_id = 0x057e;
Common::SetCurrentThreadName("JoyconScanThread"); Common::SetCurrentThreadName("JoyconScanThread");
auto last_ret = 0u;
do { do {
auto ret = SDL_hid_device_change_count(); SDL_hid_device_info* devs = SDL_hid_enumerate(nintendo_vendor_id, 0x0);
if (last_ret == 0u || last_ret != ret) { SDL_hid_device_info* cur_dev = devs;
last_ret = ret;
SDL_hid_device_info* devs = SDL_hid_enumerate(nintendo_vendor_id, 0x0); while (cur_dev) {
for (auto* cur_dev = devs; cur_dev; cur_dev = cur_dev->next) { if (IsDeviceNew(cur_dev)) {
if (IsDeviceNew(cur_dev)) { LOG_DEBUG(Input, "Device Found,type : {:04X} {:04X}", cur_dev->vendor_id,
LOG_DEBUG(Input, "Device Found,type : {:04X} {:04X}", cur_dev->vendor_id, cur_dev->product_id); cur_dev->product_id);
RegisterNewDevice(cur_dev); RegisterNewDevice(cur_dev);
}
cur_dev = cur_dev->next;
} }
SDL_hid_free_enumeration(devs); cur_dev = cur_dev->next;
} }
SDL_hid_free_enumeration(devs);
} while (Common::StoppableTimedWait(stop_token, std::chrono::seconds{5})); } while (Common::StoppableTimedWait(stop_token, std::chrono::seconds{5}));
} }