Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Externals/hidapi: Convert to submodule #12514

Merged
merged 1 commit into from Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Expand Up @@ -72,3 +72,6 @@
[submodule "Externals/enet/enet"]
path = Externals/enet/enet
url = https://github.com/lsalzman/enet.git
[submodule "hidapi-src"]
path = Externals/hidapi/hidapi-src
url = https://github.com/libusb/hidapi
7 changes: 0 additions & 7 deletions Externals/hidapi/.gitattributes

This file was deleted.

16 changes: 0 additions & 16 deletions Externals/hidapi/AUTHORS.txt

This file was deleted.

12 changes: 6 additions & 6 deletions Externals/hidapi/CMakeLists.txt
@@ -1,20 +1,20 @@
project(hidapi)

add_library(hidapi STATIC hidapi/hidapi.h)
add_library(hidapi STATIC hidapi-src/hidapi/hidapi.h)
dolphin_disable_warnings_msvc(hidapi)
target_include_directories(hidapi PUBLIC hidapi)
target_include_directories(hidapi PUBLIC hidapi-src/hidapi)

if(APPLE)
target_sources(hidapi PRIVATE mac/hid.c)
target_sources(hidapi PRIVATE hidapi-src/mac/hid.c)
elseif(MSVC)
target_sources(hidapi PRIVATE windows/hid.c)
target_sources(hidapi PRIVATE hidapi-src/windows/hid.c)
else()
find_package(LIBUDEV)
if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND LIBUDEV_FOUND)
target_sources(hidapi PRIVATE linux/hid.c)
target_sources(hidapi PRIVATE hidapi-src/linux/hid.c)
target_link_libraries(hidapi PRIVATE udev)
else()
target_sources(hidapi PRIVATE libusb/hid.c)
target_sources(hidapi PRIVATE hidapi-src/libusb/hid.c)
target_link_libraries(hidapi PRIVATE ${LIBUSB_LIBRARIES})
endif()
endif()
Expand Down
15 changes: 0 additions & 15 deletions Externals/hidapi/HACKING.txt

This file was deleted.

26 changes: 0 additions & 26 deletions Externals/hidapi/LICENSE-bsd.txt

This file was deleted.