瀏覽代碼

Merge pull request #13163 from german77/ring

core: hid: hid_core doesn't have access to LIBUSB
liamwhite 2 年之前
父節點
當前提交
15831b19a3
共有 1 個文件被更改,包括 2 次插入3 次删除
  1. 2 3
      src/hid_core/frontend/emulated_controller.cpp

+ 2 - 3
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) {
     if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) {
         camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"};
         camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"};
         nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc: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"};
         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"};
         android_params = Common::ParamPackage{"engine:android,port:100"};
 #endif
 #endif
     }
     }