From 737a04255bae96757c3ec010dd410d53f56ce8bb Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Thu, 11 Nov 2010 12:05:58 -0600 Subject: [PATCH] Use the windows HID finder --- CMakeLists.txt | 10 +++++++++- src/CMakeLists.txt | 9 +++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17082c6..d3ebd47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,8 +27,16 @@ include(UseBackportedModules) add_definitions(-DWIIUSE_COMPILE_LIB) if(NOT WIN32 AND NOT APPLE) + set(LINUX YES) find_package(Bluez REQUIRED) - include_directories("${BLUEZ_INCLUDE_DIRS}") + include_directories(${BLUEZ_INCLUDE_DIRS}) +else() + set(LINUX NO) +endif() + +if(WIN32) + find_package(WinHID REQUIRED) + include_directories(${WINHID_INCLUDE_DIRS}) endif() ### diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 466eb81..67a4339 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,17 +24,18 @@ set(API if(WIN32) list(APPEND SOURCES io_win.c) - list(APPEND API ../msvc-stdint/stdint.h) else() list(APPEND SOURCES io_nix.c) endif() - +if(MSVC) + list(APPEND API ../msvc-stdint/stdint.h) +endif() add_library(wiiuse SHARED ${SOURCES} ${API}) if(WIN32) - target_link_libraries(wiiuse Ws2_32.lib hid.lib setupapi.lib) -else() + target_link_libraries(wiiuse Ws2_32.lib ${WINHID_LIBRARIES} setupapi.lib) +elseif(LINUX) target_link_libraries(wiiuse m ${BLUEZ_LIBRARIES}) endif()