From 0db2ed0d8559e2559911959c31c9ed7c20b32e9b Mon Sep 17 00:00:00 2001 From: David Holdeman Date: Sat, 16 Mar 2024 19:46:25 -0500 Subject: [PATCH] Get default tune and include meta output folder --- firmware/rusefi.mk | 6 ++++++ simulator/Makefile | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/firmware/rusefi.mk b/firmware/rusefi.mk index 7621049577..101668f2d0 100644 --- a/firmware/rusefi.mk +++ b/firmware/rusefi.mk @@ -27,6 +27,12 @@ endif BOARDS_DIR = $(PROJECT_DIR)/config/boards +ifneq ($(META_OUTPUT_ROOT_FOLDER),) +ifeq ($(BOARD_DIR),) + BOARDINC += $(META_OUTPUT_ROOT_FOLDER) +endif +endif + # allow passing a custom board dir, otherwise generate it based on the board name ifeq ($(BOARD_DIR),) BOARD_DIR = $(BOARDS_DIR)/$(PROJECT_BOARD) diff --git a/simulator/Makefile b/simulator/Makefile index 80e7c80dac..16753c1346 100644 --- a/simulator/Makefile +++ b/simulator/Makefile @@ -12,15 +12,17 @@ # - CHIBIOS = ../firmware/ChibiOS -CHIBIOS_CONTRIB= ../firmware/ChibiOS-Contrib +CHIBIOS_CONTRIB = ../firmware/ChibiOS-Contrib RULESPATH = $(CHIBIOS)/os/common/startup/SIMIA32/compilers/GCC PROJECT_CPU=simulator +ifneq ($(BOARD_DIR),) + BOARDCPPSRC += $(BOARD_DIR)/default_tune.cpp +endif + include ../firmware/rusefi.mk -RULESFILE = ../firmware/rusefi_rules.mk # Configure precompiled header PCH_DIR = $(PROJECT_DIR)/pch