From cd11935a0e50b0098c96c5eea8dc20420b31360e Mon Sep 17 00:00:00 2001 From: steven-na Date: Mon, 10 Aug 2026 13:20:30 -0700 Subject: Moved to unity build, hopefully --- Justfile | 14 ++++---- Justfile.old | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/smrt_arena.c | 5 +-- src/unity.c | 29 +++++++++++++++++ 4 files changed, 138 insertions(+), 9 deletions(-) create mode 100644 Justfile.old create mode 100644 src/unity.c diff --git a/Justfile b/Justfile index d1f2d94..9ce70a1 100644 --- a/Justfile +++ b/Justfile @@ -18,23 +18,23 @@ gen-version type="release": build-static: (gen-version "release") mkdir -p {{build_dir}} - cd {{build_dir}} && {{cc}} {{cflags}} {{extra_cflags}} -c ../{{src_dir}}/*.c + cd {{build_dir}} && {{cc}} {{cflags}} {{extra_cflags}} -c ../{{src_dir}}/unity.c ar rcs {{build_dir}}/lib{{lib}}.a {{build_dir}}/*.o build-shared: (gen-version "release") mkdir -p {{build_dir}} - cd {{build_dir}} && {{cc}} {{cflags}} {{extra_cflags}} -c ../{{src_dir}}/*.c + cd {{build_dir}} && {{cc}} {{cflags}} {{extra_cflags}} -c ../{{src_dir}}/unity.c {{cc}} -shared -o {{build_dir}}/lib{{lib}}.so {{build_dir}}/*.o {{lflags}} build-release: (gen-version "release") mkdir -p {{build_dir}} - cd {{build_dir}} && {{cc}} {{cflags}} {{extra_cflags}} -O3 -DNDEBUG -c ../{{src_dir}}/*.c + cd {{build_dir}} && {{cc}} {{cflags}} {{extra_cflags}} -O3 -DNDEBUG -c ../{{src_dir}}/unity.c ar rcs {{build_dir}}/lib{{lib}}-release.a {{build_dir}}/*.o {{cc}} -shared -o {{build_dir}}/lib{{lib}}-release.so {{build_dir}}/*.o {{lflags}} build-debug: (gen-version "debug") mkdir -p {{build_dir}} - cd {{build_dir}} && {{cc}} {{cflags}} {{extra_cflags}} -g -O0 -fsanitize=address,undefined -fno-omit-frame-pointer -c ../{{src_dir}}/*.c + cd {{build_dir}} && {{cc}} {{cflags}} {{extra_cflags}} -g -O0 -fsanitize=address,undefined -fno-omit-frame-pointer -c ../{{src_dir}}/unity.c ar rcs {{build_dir}}/lib{{lib}}-debug.a {{build_dir}}/*.o {{cc}} -shared -fsanitize=address,undefined -o {{build_dir}}/lib{{lib}}-debug.so {{build_dir}}/*.o {{lflags}} @@ -81,13 +81,13 @@ uninstall-vendor dir: test-all: (gen-version "debug") mkdir -p {{build_dir}} - {{cc}} {{cflags}} {{extra_cflags}} {{test_dir}}/*.c {{src_dir}}/*.c -o {{build_dir}}/test -lcriterion {{lflags}} + {{cc}} {{cflags}} {{extra_cflags}} {{test_dir}}/*.c {{src_dir}}/unity.c -o {{build_dir}}/test -lcriterion {{lflags}} ./{{build_dir}}/test coverage: (gen-version "debug") mkdir -p {{build_dir}}/cov-src {{build_dir}}/cov-tests - cd {{build_dir}}/cov-src && {{cc}} {{cflags}} --coverage -c ../../{{src_dir}}/*.c - cd {{build_dir}}/cov-tests && {{cc}} {{cflags}} --coverage -c ../../{{test_dir}}/*.c + cd {{build_dir}}/cov-src && {{cc}} {{cflags}} --coverage -c ../../{{src_dir}}/unity.c + cd {{build_dir}}/cov-tests && {{cc}} {{cflags}} --coverage -c ../../{{test_dir}}/unity.c {{cc}} {{cflags}} --coverage {{build_dir}}/cov-src/*.o {{build_dir}}/cov-tests/*.o -o {{build_dir}}/test-coverage -lcriterion {{lflags}} ./{{build_dir}}/test-coverage gcovr --root . --filter '{{src_dir}}/' {{build_dir}}/cov-src --html-details {{build_dir}}/coverage.html --print-summary diff --git a/Justfile.old b/Justfile.old new file mode 100644 index 0000000..d1f2d94 --- /dev/null +++ b/Justfile.old @@ -0,0 +1,99 @@ +lib := "steez" +src_dir := "src" +test_dir := "tests" +build_dir := "build" +cc := "cc" +cflags := "-Wall -Wextra -Wpedantic -Werror -std=c23 -fPIC" +lflags := "-lm" +prefix := "/usr/local" +extra_cflags := "" + +default: + @just --list + +build: build-static build-shared + +gen-version type="release": + ./scripts/gen-version.sh {{type}} + +build-static: (gen-version "release") + mkdir -p {{build_dir}} + cd {{build_dir}} && {{cc}} {{cflags}} {{extra_cflags}} -c ../{{src_dir}}/*.c + ar rcs {{build_dir}}/lib{{lib}}.a {{build_dir}}/*.o + +build-shared: (gen-version "release") + mkdir -p {{build_dir}} + cd {{build_dir}} && {{cc}} {{cflags}} {{extra_cflags}} -c ../{{src_dir}}/*.c + {{cc}} -shared -o {{build_dir}}/lib{{lib}}.so {{build_dir}}/*.o {{lflags}} + +build-release: (gen-version "release") + mkdir -p {{build_dir}} + cd {{build_dir}} && {{cc}} {{cflags}} {{extra_cflags}} -O3 -DNDEBUG -c ../{{src_dir}}/*.c + ar rcs {{build_dir}}/lib{{lib}}-release.a {{build_dir}}/*.o + {{cc}} -shared -o {{build_dir}}/lib{{lib}}-release.so {{build_dir}}/*.o {{lflags}} + +build-debug: (gen-version "debug") + mkdir -p {{build_dir}} + cd {{build_dir}} && {{cc}} {{cflags}} {{extra_cflags}} -g -O0 -fsanitize=address,undefined -fno-omit-frame-pointer -c ../{{src_dir}}/*.c + ar rcs {{build_dir}}/lib{{lib}}-debug.a {{build_dir}}/*.o + {{cc}} -shared -fsanitize=address,undefined -o {{build_dir}}/lib{{lib}}-debug.so {{build_dir}}/*.o {{lflags}} + +install: build + sudo mkdir -p {{prefix}}/include/{{lib}} {{prefix}}/lib + sudo cp {{src_dir}}/*.h {{prefix}}/include/{{lib}}/ + sudo cp {{build_dir}}/lib{{lib}}.a {{build_dir}}/lib{{lib}}.so {{prefix}}/lib/ + sudo ldconfig + +uninstall: + sudo rm -rf {{prefix}}/include/{{lib}} + sudo rm -f {{prefix}}/lib/lib{{lib}}.a {{prefix}}/lib/lib{{lib}}.so + sudo ldconfig + +install-vendor dir: build + #!/usr/bin/env bash + set -euo pipefail + dir="{{dir}}" + dir="${dir%/}" + vendor_dir="$dir/vendor/{{lib}}" + mkdir -p "$vendor_dir/include/{{lib}}" "$vendor_dir/lib" + cp {{src_dir}}/*.h "$vendor_dir/include/{{lib}}/" + cp {{build_dir}}/lib{{lib}}.a {{build_dir}}/lib{{lib}}.so "$vendor_dir/lib/" + echo "Installed lib{{lib}} into $vendor_dir" + + target_justfile="$dir/Justfile" + if [ -f "$target_justfile" ] && grep -q '^cflags :=' "$target_justfile" && grep -q '^lflags :=' "$target_justfile"; then + echo "Detected ctmplt-layout project at $dir; wiring up build flags" + inc_flag="-Ivendor/{{lib}}/include" + static_lib="vendor/{{lib}}/lib/lib{{lib}}.a" + if ! grep -qF -- "$inc_flag" "$target_justfile"; then + sed -i "s|^cflags := \"\(.*\)\"|cflags := \"\1 $inc_flag\"|" "$target_justfile" + fi + if ! grep -qF -- "$static_lib" "$target_justfile"; then + sed -i "s|^lflags := \"\(.*\)\"|lflags := \"\1 $static_lib\"|" "$target_justfile" + fi + echo "Updated $target_justfile (cflags/lflags)" + else + echo "$target_justfile doesn't match the ctmplt bin/lib layout (no cflags:=/lflags:= Justfile); skipping auto-link wiring" + fi + +uninstall-vendor dir: + rm -rf {{dir}}/vendor/{{lib}} + +test-all: (gen-version "debug") + mkdir -p {{build_dir}} + {{cc}} {{cflags}} {{extra_cflags}} {{test_dir}}/*.c {{src_dir}}/*.c -o {{build_dir}}/test -lcriterion {{lflags}} + ./{{build_dir}}/test + +coverage: (gen-version "debug") + mkdir -p {{build_dir}}/cov-src {{build_dir}}/cov-tests + cd {{build_dir}}/cov-src && {{cc}} {{cflags}} --coverage -c ../../{{src_dir}}/*.c + cd {{build_dir}}/cov-tests && {{cc}} {{cflags}} --coverage -c ../../{{test_dir}}/*.c + {{cc}} {{cflags}} --coverage {{build_dir}}/cov-src/*.o {{build_dir}}/cov-tests/*.o -o {{build_dir}}/test-coverage -lcriterion {{lflags}} + ./{{build_dir}}/test-coverage + gcovr --root . --filter '{{src_dir}}/' {{build_dir}}/cov-src --html-details {{build_dir}}/coverage.html --print-summary + +clean: + rm -rf {{build_dir}} + +compiledb: + bear -- just build diff --git a/src/smrt_arena.c b/src/smrt_arena.c index 3618771..cf6418e 100644 --- a/src/smrt_arena.c +++ b/src/smrt_arena.c @@ -1,5 +1,7 @@ #if defined(__linux__) -#define _DEFAULT_SOURCE + #ifndef _DEFAULT_SOURCE + #define _DEFAULT_SOURCE + #endif /* ifndef _DEFAULT_SOURCE */ #endif #include "common.h" @@ -7,7 +9,6 @@ #include - static __thread smrt_arena_t *_scratch_pool[SCRATCH_POOL_SIZE] = { 0 }; smrt_arena_t *smrt_arena_create(u64 reserve_size, u64 commit_size, b32 auto_decommit) { diff --git a/src/unity.c b/src/unity.c new file mode 100644 index 0000000..61d5b02 --- /dev/null +++ b/src/unity.c @@ -0,0 +1,29 @@ +#ifndef _GNU_SOURCE + #define _GNU_SOURCE +#endif /* ifndef _GNU_SOURCE */ +#ifndef _DEFAULT_SOURCE + #define _DEFAULT_SOURCE +#endif /* ifndef _DEFAULT_SOURCE */ + +// Config for global scratch arena allocations +#if 0 + #define SCRATCH_POOL_SIZE 2 + #define SMRTA_SCRATCH_RESERVE_SIZE MiB(64) +#endif /* if 0 */ + +// Arenas and mem management +#include "ez_arena.c" +#include "smrt_arena.c" + +// Data structures +#include "string.c" +#include "vec2.c" +#include "slidingwindow.c" +#include "vec2sw.c" + +// DSP/Audio +#include "wav.c" +#include "dft.c" + +// Misc +#include "version.c" -- cgit v1.2.3