From 7e1b0321e2cacd432961b5fba3f9b6b8808df3c0 Mon Sep 17 00:00:00 2001 From: Matthew Skolaut Date: Thu, 20 Aug 2020 22:59:34 -0500 Subject: [PATCH] Cleanup Makefiles for hosted bmp on darwin --- Makefile | 2 +- src/platforms/hosted/Makefile.inc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 15ce20aa..3f7a53cb 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ ifeq ($(PROBE_HOST), pc-stlinkv2) PC_HOSTED = true NO_LIBOPENCM3 = true endif -ifeq ($(PROBE_HOST), pc-hosted) +ifeq ($(PROBE_HOST), hosted) PC_HOSTED = true NO_LIBOPENCM3 = true endif diff --git a/src/platforms/hosted/Makefile.inc b/src/platforms/hosted/Makefile.inc index 4563eb10..5a422fd6 100644 --- a/src/platforms/hosted/Makefile.inc +++ b/src/platforms/hosted/Makefile.inc @@ -15,10 +15,10 @@ SRC += serial_win.c LDFLAGS += -lws2_32 LDFLAGS += -lsetupapi #https://github.com/dmlc/xgboost/issues/1945 indicates macosx as indicator -else ifneq (filter, macosx darwin, $(SYS))) -LDFLAGS += -lsetupapi -LDFLAGS += hidapi/mac/.libs/libhidapi.a -framework IOKit -LDFLAGS += -framework CoreFoundation hidapi/mac/.libs/libhidapi.a +else ifneq (filter, macosx darwin, $(SYS)) +SRC += serial_unix.c +LDFLAGS += -lhidapi +LDFLAGS += -framework CoreFoundation CFLAGS += -Ihidapi/hidapi endif