From ef948e9797529db7aba1b7a6ede45ed392320856 Mon Sep 17 00:00:00 2001
From: Toby Jaffey <toby@ringtailsoftware.co.uk>
Date: Fri, 12 Dec 2025 15:49:03 +0000
Subject: [PATCH] Move target app only includes under apps/common

---
 apps/common/makefile.common             | 2 +-
 {common => apps/common}/target-stdint.h | 0
 {common => apps/common}/uvm32_target.h  | 0
 apps/zig-mandel/build.zig               | 1 +
 apps/zigalloc/build.zig                 | 1 +
 apps/zigdoom/build.zig                  | 1 +
 apps/zigtris/build.zig                  | 1 +
 7 files changed, 5 insertions(+), 1 deletion(-)
 rename {common => apps/common}/target-stdint.h (100%)
 rename {common => apps/common}/uvm32_target.h (100%)

diff --git a/apps/common/makefile.common b/apps/common/makefile.common
index 0fdbd9e..fd8f053 100644
--- a/apps/common/makefile.common
+++ b/apps/common/makefile.common
@@ -1,6 +1,6 @@
 PREFIX:=riscv64-elf-
 OPT ?= -Os
-CFLAGS+=-I${TOPDIR}/common
+CFLAGS+=-I${TOPDIR}/common -I${TOPDIR}/apps/common
 CFLAGS+=${OPT} -fno-stack-protector -fno-builtin-memcpy -fno-builtin
 CFLAGS+=-static-libgcc -fdata-sections -ffunction-sections
 CFLAGS+=-g -march=rv32im -mabi=ilp32 -static
diff --git a/common/target-stdint.h b/apps/common/target-stdint.h
similarity index 100%
rename from common/target-stdint.h
rename to apps/common/target-stdint.h
diff --git a/common/uvm32_target.h b/apps/common/uvm32_target.h
similarity index 100%
rename from common/uvm32_target.h
rename to apps/common/uvm32_target.h
diff --git a/apps/zig-mandel/build.zig b/apps/zig-mandel/build.zig
index 983c08b..e325cc2 100644
--- a/apps/zig-mandel/build.zig
+++ b/apps/zig-mandel/build.zig
@@ -40,6 +40,7 @@ pub fn build(b: *std.Build) void {
     exe.addAssemblyFile(b.path("../common/crt0.S"));
     exe.setLinkerScript(b.path("../common/linker.ld"));
     exe.addIncludePath(b.path("../../common"));
+    exe.addIncludePath(b.path("../common"));
 
     const bin = b.addObjCopy(exe.getEmittedBin(), .{
         .format = .bin,
diff --git a/apps/zigalloc/build.zig b/apps/zigalloc/build.zig
index 1428415..c70022f 100644
--- a/apps/zigalloc/build.zig
+++ b/apps/zigalloc/build.zig
@@ -45,6 +45,7 @@ pub fn build(b: *std.Build) void {
     exe.addAssemblyFile(b.path("../common/crt0.S"));
     exe.setLinkerScript(b.path("../common/linker.ld"));
     exe.addIncludePath(b.path("../../common"));
+    exe.addIncludePath(b.path("../common"));
 
     const bin = b.addObjCopy(exe.getEmittedBin(), .{
         .format = .bin,
diff --git a/apps/zigdoom/build.zig b/apps/zigdoom/build.zig
index ef91964..cd45182 100644
--- a/apps/zigdoom/build.zig
+++ b/apps/zigdoom/build.zig
@@ -82,6 +82,7 @@ pub fn build(b: *std.Build) void {
     exe.addAssemblyFile(b.path("../common/crt0.S"));
     exe.setLinkerScript(b.path("../common/linker.ld"));
     exe.addIncludePath(b.path("../../common"));
+    exe.addIncludePath(b.path("../common"));
 
     const bin = b.addObjCopy(exe.getEmittedBin(), .{
         .format = .bin,
diff --git a/apps/zigtris/build.zig b/apps/zigtris/build.zig
index 38cc434..cec5fa6 100644
--- a/apps/zigtris/build.zig
+++ b/apps/zigtris/build.zig
@@ -55,6 +55,7 @@ pub fn build(b: *std.Build) void {
     exe.addAssemblyFile(b.path("../common/crt0.S"));
     exe.setLinkerScript(b.path("../common/linker.ld"));
     exe.addIncludePath(b.path("../../common"));
+    exe.addIncludePath(b.path("../common"));
 
     const bin = b.addObjCopy(exe.getEmittedBin(), .{
         .format = .bin,