From a43fe4f5bf209e5ace71a6fc4891fd82ba6be0ab Mon Sep 17 00:00:00 2001 From: dragonmux Date: Mon, 11 Jul 2022 10:01:58 -0400 Subject: [PATCH] hosted: Reformatted Makefile.inc to make it easier to read --- src/platforms/hosted/Makefile.inc | 88 +++++++++++++++---------------- 1 file changed, 43 insertions(+), 45 deletions(-) diff --git a/src/platforms/hosted/Makefile.inc b/src/platforms/hosted/Makefile.inc index 8366c72..b2c8840 100644 --- a/src/platforms/hosted/Makefile.inc +++ b/src/platforms/hosted/Makefile.inc @@ -10,72 +10,70 @@ CFLAGS +=-I ./target # This can be useful to minimize external dependencies, and make building on # windows systems easier and is default now. ifneq (, $(findstring linux, $(SYS))) -HOSTED_BMP_ONLY ?= 0 + HOSTED_BMP_ONLY ?= 0 else -HOSTED_BMP_ONLY ?= 1 + HOSTED_BMP_ONLY ?= 1 endif CFLAGS += -DHOSTED_BMP_ONLY=$(HOSTED_BMP_ONLY) HIDAPILIB = hidapi ifneq (, $(findstring linux, $(SYS))) -SRC += serial_unix.c -HIDAPILIB = hidapi-hidraw -ifeq ($(ASAN), 1) -CFLAGS += -fsanitize=address -Wno-format-truncation -LDFLAGS += -fsanitize=address -endif + SRC += serial_unix.c + HIDAPILIB = hidapi-hidraw + ifeq ($(ASAN), 1) + CFLAGS += -fsanitize=address -Wno-format-truncation + LDFLAGS += -fsanitize=address + endif else ifneq (, $(findstring mingw, $(SYS))) -# Build for windows versions Vista, and above, where the -# 'SetupDiGetDevicePropertyW()' function is available -CFLAGS += -D_WIN32_WINNT=0x600 -SRC += serial_win.c -LDFLAGS += -lws2_32 -LDFLAGS += -lsetupapi + # Build for windows versions Vista, and above, where the + # 'SetupDiGetDevicePropertyW()' function is available + CFLAGS += -D_WIN32_WINNT=0x600 + SRC += serial_win.c + LDFLAGS += -lws2_32 + LDFLAGS += -lsetupapi else ifneq (, $(findstring cygwin, $(SYS))) -# Build for windows versions Vista, and above, where the -# 'SetupDiGetDevicePropertyW()' function is available -CFLAGS += -D_WIN32_WINNT=0x600 -SRC += serial_win.c -LDFLAGS += -lws2_32 -LDFLAGS += -lsetupapi -#https://github.com/dmlc/xgboost/issues/1945 indicates macosx as indicator + # Build for windows versions Vista, and above, where the + # 'SetupDiGetDevicePropertyW()' function is available + CFLAGS += -D_WIN32_WINNT=0x600 + 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)) -SRC += serial_unix.c -LDFLAGS += $(pkg-config --libs hidapi) -LDFLAGS += -framework CoreFoundation -CFLAGS += -Ihidapi/hidapi $(pkg-config --cflags hidapi) + SRC += serial_unix.c + LDFLAGS += -framework CoreFoundation endif ifneq ($(HOSTED_BMP_ONLY), 1) - $(shell pkg-config --exists libftdi1) - ifneq ($(.SHELLSTATUS), 0) - $(error Please install libftdi1 dependency or set HOSTED_BMP_ONLY to 1) - endif - LDFLAGS += -lusb-1.0 - CFLAGS += $(shell pkg-config --cflags libftdi1) - LDFLAGS += $(shell pkg-config --libs libftdi1) - CFLAGS += -Wno-missing-field-initializers + $(shell pkg-config --exists libftdi1) + ifneq ($(.SHELLSTATUS), 0) + $(error Please install libftdi1 dependency or set HOSTED_BMP_ONLY to 1) + endif + LDFLAGS += -lusb-1.0 + CFLAGS += $(shell pkg-config --cflags libftdi1) + LDFLAGS += $(shell pkg-config --libs libftdi1) + CFLAGS += -Wno-missing-field-initializers endif ifneq ($(HOSTED_BMP_ONLY), 1) - CFLAGS += -DCMSIS_DAP - SRC += cmsis_dap.c dap.c - $(shell pkg-config --exists $(HIDAPILIB)) - ifneq ($(.SHELLSTATUS), 0) - $(error Please install $(HIDAPILIB) dependency or set HOSTED_BMP_ONLY to 1) - endif - CFLAGS += $(shell pkg-config --cflags $(HIDAPILIB)) - LDFLAGS += $(shell pkg-config --libs $(HIDAPILIB)) + CFLAGS += -DCMSIS_DAP + SRC += cmsis_dap.c dap.c + $(shell pkg-config --exists $(HIDAPILIB)) + ifneq ($(.SHELLSTATUS), 0) + $(error Please install $(HIDAPILIB) dependency or set HOSTED_BMP_ONLY to 1) + endif + CFLAGS += $(shell pkg-config --cflags $(HIDAPILIB)) + LDFLAGS += $(shell pkg-config --libs $(HIDAPILIB)) endif SRC += timing.c cli.c utils.c SRC += bmp_remote.c remote_swdptap.c remote_jtagtap.c ifneq ($(HOSTED_BMP_ONLY), 1) -SRC += bmp_libusb.c stlinkv2.c -SRC += ftdi_bmp.c libftdi_swdptap.c libftdi_jtagtap.c -SRC += jlink.c jlink_adiv5_swdp.c jlink_jtagtap.c + SRC += bmp_libusb.c stlinkv2.c + SRC += ftdi_bmp.c libftdi_swdptap.c libftdi_jtagtap.c + SRC += jlink.c jlink_adiv5_swdp.c jlink_jtagtap.c else -SRC += bmp_serial.c + SRC += bmp_serial.c endif PC_HOSTED = 1