Przeglądaj źródła

input_common: make libusb private to gc_adapter

Jan Beich 6 lat temu
rodzic
commit
883fab2fff

+ 2 - 2
src/input_common/CMakeLists.txt

@@ -30,8 +30,8 @@ if(SDL2_FOUND)
     target_compile_definitions(input_common PRIVATE HAVE_SDL2)
 endif()
 
-target_include_directories(input_common SYSTEM PUBLIC ${LIBUSB_INCLUDE_DIR})
-target_link_libraries(input_common PUBLIC ${LIBUSB_LIBRARIES})
+target_include_directories(input_common SYSTEM PRIVATE ${LIBUSB_INCLUDE_DIR})
+target_link_libraries(input_common PRIVATE ${LIBUSB_LIBRARIES})
 
 create_target_directory_groups(input_common)
 target_link_libraries(input_common PUBLIC core PRIVATE common Boost::boost)

+ 1 - 0
src/input_common/gcadapter/gc_adapter.cpp

@@ -4,6 +4,7 @@
 
 #include <chrono>
 #include <thread>
+#include <libusb.h>
 #include "common/logging/log.h"
 #include "input_common/gcadapter/gc_adapter.h"
 

+ 4 - 1
src/input_common/gcadapter/gc_adapter.h

@@ -8,10 +8,13 @@
 #include <mutex>
 #include <thread>
 #include <unordered_map>
-#include <libusb.h>
 #include "common/common_types.h"
 #include "common/threadsafe_queue.h"
 
+struct libusb_context;
+struct libusb_device;
+struct libusb_device_handle;
+
 namespace GCAdapter {
 
 enum {