From e5977d0d4fdacd63542bced24f92891bcbdf5898 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Wed, 2 Mar 2022 15:03:45 -0800 Subject: [PATCH] Switch to using --library to point to Kaleidoscope when building. Fixes #1116 - now we don't include other random libraries in Kaleidoscope's parent dir in our arduino search path Signed-off-by: Jesse Vincent --- etc/makefiles/sketch.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/etc/makefiles/sketch.mk b/etc/makefiles/sketch.mk index 7d158dfc..987f9c6c 100644 --- a/etc/makefiles/sketch.mk +++ b/etc/makefiles/sketch.mk @@ -47,12 +47,6 @@ HEX_FILE_WITH_BOOTLOADER_PATH := $(OUTPUT_PATH)/$(OUTPUT_FILE_PREFIX)-with-boot ELF_FILE_PATH := $(OUTPUT_PATH)/$(OUTPUT_FILE_PREFIX).elf LIB_FILE_PATH := $(OUTPUT_PATH)/$(OUTPUT_FILE_PREFIX).a - -KALEIDOSCOPE_PLATFORM_LIB_DIR := $(abspath $(KALEIDOSCOPE_DIR)/..) - - - - ifeq ($(FQBN),) possible_fqbns = $(shell $(ARDUINO_CLI) board list --format=json |grep FQBN| grep -v "keyboardio:virtual"|cut -d: -f 2-) @@ -176,7 +170,7 @@ endif compile: $(QUIET) install -d "${OUTPUT_PATH}" $(QUIET) $(ARDUINO_CLI) compile --fqbn "${FQBN}" ${ARDUINO_VERBOSE} --warnings all ${ccache_wrapper_property} ${local_cflags_property} \ - --libraries "${KALEIDOSCOPE_PLATFORM_LIB_DIR}" \ + --library "${KALEIDOSCOPE_DIR}" \ --libraries "${KALEIDOSCOPE_DIR}/plugins/" \ --build-path "${BUILD_PATH}" \ --output-dir "${OUTPUT_PATH}" \