diff options
| author | 2020-07-13 18:48:19 +0000 | |
|---|---|---|
| committer | 2020-07-13 18:48:19 +0000 | |
| commit | 883fab2fff5ff9bdad38eee4e55bacc520ce0cc9 (patch) | |
| tree | 63d754c60cb1962440a9c2fad52a4d19924b1434 /src | |
| parent | cmake: pass libusb include directory as well (diff) | |
| download | yuzu-883fab2fff5ff9bdad38eee4e55bacc520ce0cc9.tar.gz yuzu-883fab2fff5ff9bdad38eee4e55bacc520ce0cc9.tar.xz yuzu-883fab2fff5ff9bdad38eee4e55bacc520ce0cc9.zip | |
input_common: make libusb private to gc_adapter
Diffstat (limited to 'src')
| -rw-r--r-- | src/input_common/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/input_common/gcadapter/gc_adapter.cpp | 1 | ||||
| -rw-r--r-- | src/input_common/gcadapter/gc_adapter.h | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt index 1d7e19a66..317c25bad 100644 --- a/src/input_common/CMakeLists.txt +++ b/src/input_common/CMakeLists.txt | |||
| @@ -30,8 +30,8 @@ if(SDL2_FOUND) | |||
| 30 | target_compile_definitions(input_common PRIVATE HAVE_SDL2) | 30 | target_compile_definitions(input_common PRIVATE HAVE_SDL2) |
| 31 | endif() | 31 | endif() |
| 32 | 32 | ||
| 33 | target_include_directories(input_common SYSTEM PUBLIC ${LIBUSB_INCLUDE_DIR}) | 33 | target_include_directories(input_common SYSTEM PRIVATE ${LIBUSB_INCLUDE_DIR}) |
| 34 | target_link_libraries(input_common PUBLIC ${LIBUSB_LIBRARIES}) | 34 | target_link_libraries(input_common PRIVATE ${LIBUSB_LIBRARIES}) |
| 35 | 35 | ||
| 36 | create_target_directory_groups(input_common) | 36 | create_target_directory_groups(input_common) |
| 37 | target_link_libraries(input_common PUBLIC core PRIVATE common Boost::boost) | 37 | target_link_libraries(input_common PUBLIC core PRIVATE common Boost::boost) |
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 { |