Skip to content

Commit 17672bd

Browse files
committed
hidapi build.
1 parent 5a20b94 commit 17672bd

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

build-hidapi.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,19 @@ for triple in "${triples[@]}"; do
2828
if [ -n "$(fn_os_arch_fromtriplet $triple | grep macos)" ]; then
2929
echo "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET"
3030
echo "SDK_VERSION=$SDK_VERSION"
31+
CFLAGS="$CFLAGS -include $script_dir/support/macos-common/forward-decl.h"
32+
unset EXTRA_ARGS
3133
elif [ -n "$(fn_os_arch_fromtriplet $triple | grep windows)" ]; then
3234
CFLAGS="$CFLAGS -static"
3335
LDFLAGS="$LDFLAGS -static -pthread"
36+
unset EXTRA_ARGS
3437
else
3538
CFLAGS="$CFLAGS -static"
3639
LDFLAGS="$LDFLAGS -static -pthread"
40+
EXTRA_ARGS="-DHIDAPI_WITH_HIDRAW=OFF -DHIDAPI_WITH_LIBUSB=ON"
3741
fi
3842

39-
rcmd cmake "$source_dir" -DCMAKE_BUILD_TYPE=Release -G Ninja -DCMAKE_TOOLCHAIN_FILE="$script_dir/support/$(fn_os_arch_fromtriplet "$triple")-toolchain.cmake" -DCMAKE_PREFIX_PATH="$xroot_dir" -DCMAKE_INSTALL_PREFIX="$xroot_dir" -DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS" -DBUILD_SHARED_LIBS=OFF -DHIDAPI_WITH_HIDRAW=OFF -DHIDAPI_WITH_LIBUSB=ON
43+
rcmd cmake "$source_dir" -DCMAKE_BUILD_TYPE=Release -G Ninja -DCMAKE_TOOLCHAIN_FILE="$script_dir/support/$(fn_os_arch_fromtriplet "$triple")-toolchain.cmake" -DCMAKE_PREFIX_PATH="$xroot_dir" -DCMAKE_INSTALL_PREFIX="$xroot_dir" -DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS" -DBUILD_SHARED_LIBS=OFF ${EXTRA_ARGS:-}
4044
rcmd cmake --build . --target install -- -j$(nproc)
4145
popd >/dev/null 2>&1
4246
done

build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ cd "$script_dir"
1111

1212
./build-libusb.sh
1313
./build-libusb-compat.sh
14+
./build-hidapi.sh
1415
./build-libftdi.sh
1516
./build-libserialport.sh
1617
./build-dfu-programmer.sh
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// Copyright 2024-2025 Nick Brassel (@tzarc)
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
#pragma once
4+
5+
#ifndef __BLOCKS__
6+
// dispatch_block_t is only defined when blocks are enabled during build... which aren't. Fake it with an opaque pointer.
7+
typedef void* dispatch_block_t;
8+
#endif // __BLOCKS__

0 commit comments

Comments
 (0)