From 95c86b3ea59286a0a5fe8eb8d4e4a511aeefa24c Mon Sep 17 00:00:00 2001 From: Klagarge Date: Sat, 18 Apr 2026 09:27:37 +0000 Subject: [PATCH] fix(lab03): use make instead of cmake --- .gitignore | 14 ++------------ src/03-led-controller/CMakeLists.txt | 5 ----- src/03-led-controller/Makefile | 5 +++++ src/03-led-controller/justfile | 4 +++- 4 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 src/03-led-controller/CMakeLists.txt create mode 100644 src/03-led-controller/Makefile diff --git a/.gitignore b/.gitignore index 4344728..7140184 100644 --- a/.gitignore +++ b/.gitignore @@ -56,15 +56,5 @@ boot-scripts/boot.net doc/**/*.pdf -CMakeLists.txt.user -CMakeCache.txt -CMakeFiles -CMakeScripts -Testing -Makefile -cmake_install.cmake -install_manifest.txt -compile_commands.json -CTestTestfile.cmake -_deps -CMakeUserPresets.json +build +src/03-led-controller/led-controller diff --git a/src/03-led-controller/CMakeLists.txt b/src/03-led-controller/CMakeLists.txt deleted file mode 100644 index 62abb23..0000000 --- a/src/03-led-controller/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -cmake_minimum_required(VERSION 3.28) -project(led-controller) - -include(../nanopi.cmake) -add_executable(led-controller main.c) diff --git a/src/03-led-controller/Makefile b/src/03-led-controller/Makefile new file mode 100644 index 0000000..d9d45cb --- /dev/null +++ b/src/03-led-controller/Makefile @@ -0,0 +1,5 @@ +EXE=led-controller +SRCS=$(wildcard *.c) + +# Include the standard application Makefile for the CSEL1 labs +include ../appl.mk diff --git a/src/03-led-controller/justfile b/src/03-led-controller/justfile index b965e1c..1e9dacb 100644 --- a/src/03-led-controller/justfile +++ b/src/03-led-controller/justfile @@ -1,5 +1,7 @@ build: - cmake -S . -B build && cmake --build build + make clean: rm -rf build + rm -rf .obj + rm led-controller