From 4156bdcd16ddd8ed704e6eaf1a9f532a5f0ab409 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Tue, 24 Dec 2024 11:39:29 +0100 Subject: [PATCH] depends: cleanup packages.mk --- contrib/depends/packages/packages.mk | 40 ++++++++++++++++------------ 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk index cb4e8e228..a5352cfe0 100644 --- a/contrib/depends/packages/packages.mk +++ b/contrib/depends/packages/packages.mk @@ -1,28 +1,34 @@ -packages:=boost openssl zeromq expat unbound sodium +native_packages := native_protobuf +packages := boost openssl zeromq expat unbound sodium protobuf -hardware_packages := hidapi protobuf libusb -hardware_native_packages := native_protobuf +ifneq ($(host_os),android) +packages += libusb +endif -android_native_packages = android_ndk $(hardware_native_packages) -android_packages = ncurses readline protobuf +ifneq ($(host_os),freebsd) +ifneq ($(host_os),android) +packages += hidapi +endif +endif -darwin_native_packages = $(hardware_native_packages) -darwin_packages = ncurses readline $(hardware_packages) - -# not really native... -freebsd_native_packages = freebsd_base $(hardware_native_packages) -freebsd_packages = ncurses readline protobuf libusb - -linux_packages = eudev ncurses readline $(hardware_packages) -linux_native_packages = $(hardware_native_packages) +ifneq ($(host_os),mingw32) +packages += ncurses readline +endif ifeq ($(build_tests),ON) packages += gtest endif -mingw32_packages = $(hardware_packages) -mingw32_native_packages = $(hardware_native_packages) +linux_native_packages := +linux_packages := eudev + +freebsd_native_packages := freebsd_base +freebsd_packages := ifneq ($(build_os),darwin) -darwin_native_packages += darwin_sdk native_cctools native_libtapi +darwin_native_packages := darwin_sdk native_cctools native_libtapi endif +darwin_packages := + +android_native_packages := android_ndk +android_packages :=