diff --git a/app/meson.build b/app/meson.build index 88b8ef8c..60888bb3 100644 --- a/app/meson.build +++ b/app/meson.build @@ -75,9 +75,9 @@ endif aoa_hid_support = host_machine.system() == 'linux' if aoa_hid_support src += [ - 'src/aoa_hid.c', - 'src/hid_keyboard.c', - 'src/hid_mouse.c', + 'src/usb/aoa_hid.c', + 'src/usb/hid_keyboard.c', + 'src/usb/hid_mouse.c', ] endif diff --git a/app/src/scrcpy.c b/app/src/scrcpy.c index 1534c772..c1e20edb 100644 --- a/app/src/scrcpy.c +++ b/app/src/scrcpy.c @@ -17,16 +17,17 @@ #include "decoder.h" #include "events.h" #include "file_pusher.h" -#ifdef HAVE_AOA_HID -# include "hid_keyboard.h" -# include "hid_mouse.h" -#endif #include "keyboard_inject.h" #include "mouse_inject.h" #include "recorder.h" #include "screen.h" #include "server.h" #include "stream.h" +#ifdef HAVE_AOA_HID +# include "usb/aoa_hid.h" +# include "usb/hid_keyboard.h" +# include "usb/hid_mouse.h" +#endif #include "util/acksync.h" #include "util/log.h" #include "util/net.h" diff --git a/app/src/aoa_hid.c b/app/src/usb/aoa_hid.c similarity index 100% rename from app/src/aoa_hid.c rename to app/src/usb/aoa_hid.c diff --git a/app/src/aoa_hid.h b/app/src/usb/aoa_hid.h similarity index 100% rename from app/src/aoa_hid.h rename to app/src/usb/aoa_hid.h diff --git a/app/src/hid_keyboard.c b/app/src/usb/hid_keyboard.c similarity index 100% rename from app/src/hid_keyboard.c rename to app/src/usb/hid_keyboard.c diff --git a/app/src/hid_keyboard.h b/app/src/usb/hid_keyboard.h similarity index 100% rename from app/src/hid_keyboard.h rename to app/src/usb/hid_keyboard.h diff --git a/app/src/hid_mouse.c b/app/src/usb/hid_mouse.c similarity index 100% rename from app/src/hid_mouse.c rename to app/src/usb/hid_mouse.c diff --git a/app/src/hid_mouse.h b/app/src/usb/hid_mouse.h similarity index 100% rename from app/src/hid_mouse.h rename to app/src/usb/hid_mouse.h