From 7f37ccb749e2f1d9117ab8d331b6c2befdcd09b1 Mon Sep 17 00:00:00 2001 From: Madeleine Lee Date: Sat, 2 Mar 2024 03:06:34 -0600 Subject: [PATCH] Changed build directory for the unit tests to be the same as the general Objects folder. --- Makefile | 1 - Tests/UnitTests/Makefile | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 319e99fec..c73e3915f 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,6 @@ help: clean: - rm -fR Tests/UnitTests/Objects rm -fR Objects rm -f *.out rm -fr Docs/doxygen diff --git a/Tests/UnitTests/Makefile b/Tests/UnitTests/Makefile index 863b2333e..fa621bce5 100644 --- a/Tests/UnitTests/Makefile +++ b/Tests/UnitTests/Makefile @@ -11,7 +11,7 @@ YELLOW=\033[0;33m NC=\033[0m # No Color # Build path -BUILD_DIR = Objects +BUILD_DIR = ../../Objects ###################################### # source @@ -46,9 +46,6 @@ SF = st-flash ####################################### # C_INCLUDES ####################################### - -#-iquote: used to stop the compiler from searching the current directory first. Another effect: -Idirs before it are only searched for "" files -# Whatever I put after iquote doesn't seem to be found, but putting it in twice works. This will break #include-next, though C_INCLUDES := \ -I- \ -I../../Tests/Inc/ \