diff options
| author | 2020-07-13 22:21:07 -0400 | |
|---|---|---|
| committer | 2020-07-13 22:21:07 -0400 | |
| commit | edb2caaae53109136ef6019a4ac64f5ab6defb1e (patch) | |
| tree | 3d8a1ff70eb0527cb5acd2bde6016365fd371972 /src/input_common/gcadapter | |
| parent | Merge pull request #4318 from lioncash/cpp20 (diff) | |
| parent | input_common: drop unused libusb.h include (diff) | |
| download | yuzu-edb2caaae53109136ef6019a4ac64f5ab6defb1e.tar.gz yuzu-edb2caaae53109136ef6019a4ac64f5ab6defb1e.tar.xz yuzu-edb2caaae53109136ef6019a4ac64f5ab6defb1e.zip | |
Merge pull request #4280 from jbeich/system-libusb
cmake: pass libusb include directory
Diffstat (limited to 'src/input_common/gcadapter')
| -rw-r--r-- | src/input_common/gcadapter/gc_adapter.cpp | 1 | ||||
| -rw-r--r-- | src/input_common/gcadapter/gc_adapter.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/input_common/gcadapter/gc_adapter.cpp b/src/input_common/gcadapter/gc_adapter.cpp index 6d9f4d9eb..c031fc22a 100644 --- a/src/input_common/gcadapter/gc_adapter.cpp +++ b/src/input_common/gcadapter/gc_adapter.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #include <chrono> | 5 | #include <chrono> |
| 6 | #include <thread> | 6 | #include <thread> |
| 7 | #include <libusb.h> | ||
| 7 | #include "common/logging/log.h" | 8 | #include "common/logging/log.h" |
| 8 | #include "input_common/gcadapter/gc_adapter.h" | 9 | #include "input_common/gcadapter/gc_adapter.h" |
| 9 | 10 | ||
diff --git a/src/input_common/gcadapter/gc_adapter.h b/src/input_common/gcadapter/gc_adapter.h index b1c2a1958..1337c260e 100644 --- a/src/input_common/gcadapter/gc_adapter.h +++ b/src/input_common/gcadapter/gc_adapter.h | |||
| @@ -8,10 +8,13 @@ | |||
| 8 | #include <mutex> | 8 | #include <mutex> |
| 9 | #include <thread> | 9 | #include <thread> |
| 10 | #include <unordered_map> | 10 | #include <unordered_map> |
| 11 | #include <libusb.h> | ||
| 12 | #include "common/common_types.h" | 11 | #include "common/common_types.h" |
| 13 | #include "common/threadsafe_queue.h" | 12 | #include "common/threadsafe_queue.h" |
| 14 | 13 | ||
| 14 | struct libusb_context; | ||
| 15 | struct libusb_device; | ||
| 16 | struct libusb_device_handle; | ||
| 17 | |||
| 15 | namespace GCAdapter { | 18 | namespace GCAdapter { |
| 16 | 19 | ||
| 17 | enum { | 20 | enum { |