diff options
| author | liamwhite <[email protected]> | 2024-02-25 14:01:05 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-02-25 14:01:05 -0500 |
| commit | 15831b19a3d5478d88cfec0cc52555df208dbd15 (patch) | |
| tree | 96dcece1abea19d272ac7d729c2c3cf459ca4231 /src | |
| parent | 8416d1c028b3d0fe7ab70dacd28ab8e076014f70 (diff) | |
| parent | e62cea20d10c7da79c744f2cccaef5ecd7e4d5dc (diff) | |
| download | yuzu-android-15831b19a3d5478d88cfec0cc52555df208dbd15.tar.gz yuzu-android-15831b19a3d5478d88cfec0cc52555df208dbd15.zip | |
Merge pull request #13163 from german77/ring
core: hid: hid_core doesn't have access to LIBUSB
Diffstat (limited to 'src')
| -rw-r--r-- | src/hid_core/frontend/emulated_controller.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp index 7664341bd..9aa08d5cc 100644 --- a/src/hid_core/frontend/emulated_controller.cpp +++ b/src/hid_core/frontend/emulated_controller.cpp @@ -176,10 +176,9 @@ void EmulatedController::LoadDevices() { if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) { camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"}; nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"}; -#ifdef HAVE_LIBUSB +#ifndef ANDROID ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"}; -#endif -#ifdef ANDROID +#else android_params = Common::ParamPackage{"engine:android,port:100"}; #endif } |