From 15d738cc081188cdbbddc81bb912fd595e33ae9a Mon Sep 17 00:00:00 2001
From: Amine Chalandi <amine.chalandi@gmail.com>
Date: Sat, 14 Sep 2024 01:43:45 +0200
Subject: [PATCH] update makefile

---
 Build/Makefile | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/Build/Makefile b/Build/Makefile
index bc0216a..4528905 100644
--- a/Build/Makefile
+++ b/Build/Makefile
@@ -14,13 +14,13 @@
 ############################################################################################
 # Defines
 ############################################################################################
-
-PRJ_NAME   = Baremetal_Pico2_dual_core_nosdk
-OUTPUT_DIR = ../Output
-OBJ_DIR    = $(OUTPUT_DIR)/Obj
-LD_SCRIPT  = $(SRC_DIR)/Memory_Map.ld
-PIO_OUT_DIR= $(SRC_DIR)/pio
-SRC_DIR    = ../Code
+CORE_FAMILY_LOWER_CASE = $(shell echo $(CORE_FAMILY) | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z]//g')
+PRJ_NAME               = $(CORE_FAMILY_LOWER_CASE)_baremetal_pico2_dual_core_nosdk
+OUTPUT_DIR             = ../Output
+OBJ_DIR                = $(OUTPUT_DIR)/$(CORE_FAMILY_LOWER_CASE)_obj
+LD_SCRIPT              = $(SRC_DIR)/Memory_Map.ld
+PIO_OUT_DIR            = $(SRC_DIR)/pio
+SRC_DIR                = ../Code
 
 ifeq ($(OS),Windows_NT)
     PYTHON     = python
@@ -251,21 +251,22 @@ ifeq ($(MAKECMDGOALS),build)
 -include $(subst .o,.d,$(FILES_O))
 endif
 
-build : PRE_BUILD_INFO  PIO_SRC_GEN  $(OUTPUT_DIR)/$(PRJ_NAME).elf  POST_BUILD_INFO
+build : PRE_BUILD  PIO_SRC_GEN  $(OUTPUT_DIR)/$(PRJ_NAME).elf  POST_BUILD
 
-all : PRE_BUILD_INFO  PIO_SRC_GEN  $(OUTPUT_DIR)/$(PRJ_NAME).elf  POST_BUILD_INFO
+all : PRE_BUILD  PIO_SRC_GEN  $(OUTPUT_DIR)/$(PRJ_NAME).elf  POST_BUILD
 
-.PHONY : PRE_BUILD_INFO
-PRE_BUILD_INFO:
+.PHONY : PRE_BUILD
+PRE_BUILD:
 	@$(if $(strip $(PICOTOOL_FAMILY_ID)), ,$(error Error: the Entered CORE_FAMILY is not supported!))
 	@-echo +++ Building RP2350 baremetal image for $(CORE_FAMILY) core
 	@git log -n 1 --decorate-refs=refs/heads/ --pretty=format:"+++ Git branch: %D (%h)" 2>/dev/null || true
 	@git log -n 1 --clear-decorations 2> /dev/null > /dev/null || true
 	@echo +++ info: "$(shell $(CC) -v 2>&1 | tail -n 1)"
 	@echo +++ info: "$(shell make -v 2>&1 | head -n 1)"
+	@$(if $(shell test -d $(OBJ_DIR) && echo yes),,mkdir -p $(subst \,/,$(OBJ_DIR)))
 
-.PHONY : POST_BUILD_INFO
-POST_BUILD_INFO:
+.PHONY : POST_BUILD
+POST_BUILD:
 	@-echo +++ End
 
 .PHONY : PIO_SRC_GEN
@@ -283,7 +284,7 @@ clean :
 	@-rm -rf $(OUTPUT_DIR) *.list 2>/dev/null || true
 	@-rm -rf $(OUTPUT_DIR) *.map  2>/dev/null || true
 	@-rm -rf $(OUTPUT_DIR) *.txt  2>/dev/null || true
-	@-mkdir -p $(subst \,/,$(OBJ_DIR))
+	@-mkdir -p $(subst \,/,$(OUTPUT_DIR))
 
 $(OBJ_DIR)/%.o : %.c
 	@-echo +++ compile: $(subst \,/,$<) to $(subst \,/,$@)