Improve OpenBSD build compatibility
All checks were successful
Alpine 3.20 Success

It still doesn't build, though, because 7.6 doesn't have 0.14 yet.
This commit is contained in:
Přemysl Eric Janouch 2024-11-25 13:47:06 +01:00
parent 2a0cac2b42
commit 46f83a033f
Signed by: p
GPG Key ID: A0420B94F92B9493
3 changed files with 11 additions and 3 deletions

View File

@ -37,7 +37,7 @@ set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/liberty/cmake)
find_package (PkgConfig REQUIRED)
pkg_check_modules (libusb libusb-1.0)
pkg_search_module (hidapi hidapi hidapi-hidraw)
pkg_search_module (hidapi hidapi hidapi-hidraw hidapi-libusb)
option (WITH_LIBUSB "Compile with libusb-based utilities" ${libusb_FOUND})
option (WITH_HIDAPI "Compile with hidapi-based utilities" ${hidapi_FOUND})
@ -57,9 +57,13 @@ elseif (APPLE)
endif ()
if (WITH_LIBUSB AND NOT WIN32)
# -liconv may or may not be a part of libc
find_path (iconv_INCLUDE_DIRS iconv.h)
list (APPEND targets elksmart-comm)
add_executable (elksmart-comm elksmart-comm.c)
target_include_directories (elksmart-comm PUBLIC ${libusb_INCLUDE_DIRS})
target_include_directories (elksmart-comm
PUBLIC ${libusb_INCLUDE_DIRS} ${iconv_INCLUDE_DIRS})
target_link_directories (elksmart-comm PUBLIC ${libusb_LIBRARY_DIRS})
target_link_libraries (elksmart-comm ${libusb_LIBRARIES})
endif ()

View File

@ -34,7 +34,7 @@ Building
Build dependencies:
CMake, pkg-config, liberty (included), help2man +
Runtime dependencies:
libusb-1.0 (elksmart-comm, razer-bw-te-ctl), hidapi (eizoctl)
libusb-1.0 (elksmart-comm, razer-bw-te-ctl), hidapi >= 0.14 (eizoctl)
$ git clone --recursive https://git.janouch.name/p/usb-drivers.git
$ mkdir usb-drivers/build

View File

@ -37,6 +37,10 @@
#undef PROGRAM_NAME
#define PROGRAM_NAME "eizoctl"
#ifdef __OpenBSD__
#define hid_init hidapi_hid_init
#endif
#if defined __GNUC__
#define ATTRIBUTE_PRINTF(x, y) __attribute__((format(printf, x, y)))
#else