diff --git a/etc/sketch-arduino-cli.mk b/etc/sketch-arduino-cli.mk index dc2393c6..26cbab0f 100644 --- a/etc/sketch-arduino-cli.mk +++ b/etc/sketch-arduino-cli.mk @@ -69,11 +69,11 @@ export SKETCH_FILE_PATH := $(firstword $(foreach dir,$(sketch_dir_candidates),$( export SKETCH_IDENTIFIER := $(shell echo "$${SKETCH_FILE_PATH}" | cksum | cut -d ' ' -f 1)-$(SKETCH_FILE_NAME) -export SKETCH_BUILD_DIR := $(SKETCH_IDENTIFIER)/build -export SKETCH_OUTPUT_DIR := $(SKETCH_IDENTIFIER)/output +export SKETCH_BUILD_DIR ?= $(SKETCH_IDENTIFIER)/build +export SKETCH_OUTPUT_DIR ?= $(SKETCH_IDENTIFIER)/output -export BUILD_PATH := $(KALEIDOSCOPE_BUILD_PATH)/$(SKETCH_BUILD_DIR) -export OUTPUT_PATH := $(KALEIDOSCOPE_OUTPUT_PATH)/$(SKETCH_OUTPUT_DIR) +export BUILD_PATH ?= $(KALEIDOSCOPE_BUILD_PATH)/$(SKETCH_BUILD_DIR) +export OUTPUT_PATH ?= $(KALEIDOSCOPE_OUTPUT_PATH)/$(SKETCH_OUTPUT_DIR) export LIB_PROPERTIES_PATH := "../.." diff --git a/testing/makefiles/testcase.mk b/testing/makefiles/testcase.mk index 8604ae7c..9ed60033 100644 --- a/testing/makefiles/testcase.mk +++ b/testing/makefiles/testcase.mk @@ -48,10 +48,10 @@ compile-sketch: @echo "link" install -d "${BIN_DIR}" "${LIB_DIR}" env LIBONLY=yes \ - LOCAL_CFLAGS="'-I$(shell pwd)'" \ - OUTPUT_PATH="${LIB_DIR}" \ - VERBOSE=${VERBOSE} \ - ARCH=virtual DEFAULT_SKETCH=sketch \ + LOCAL_CFLAGS="'-I$(shell pwd)'" \ + OUTPUT_PATH="${LIB_DIR}" \ + VERBOSE=${VERBOSE} \ + ARCH=virtual \ $(MAKE) -f ${top_dir}/testing/makefiles/delegate.mk compile g++ -o "${BIN_DIR}/${BIN_FILE}" \ -lpthread \