summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar liamwhite2024-02-25 14:01:05 -0500
committerGravatar GitHub2024-02-25 14:01:05 -0500
commit15831b19a3d5478d88cfec0cc52555df208dbd15 (patch)
tree96dcece1abea19d272ac7d729c2c3cf459ca4231 /src
parentMerge pull request #13154 from german77/vibration-filter (diff)
parentcore: hid: hid_core doesn't have access to LIBUSB (diff)
downloadyuzu-15831b19a3d5478d88cfec0cc52555df208dbd15.tar.gz
yuzu-15831b19a3d5478d88cfec0cc52555df208dbd15.tar.xz
yuzu-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.cpp5
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() {
176 if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) { 176 if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) {
177 camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"}; 177 camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"};
178 nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"}; 178 nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"};
179#ifdef HAVE_LIBUSB 179#ifndef ANDROID
180 ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"}; 180 ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"};
181#endif 181#else
182#ifdef ANDROID
183 android_params = Common::ParamPackage{"engine:android,port:100"}; 182 android_params = Common::ParamPackage{"engine:android,port:100"};
184#endif 183#endif
185 } 184 }