From 0653447bb63b5c06d4e82cf2a126a81dfc610b7c Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Sun, 5 Nov 2023 17:18:40 +0100 Subject: [PATCH] Move includes out of src This mirrors gb-starter-kit, where it was important because submodules can pull in `.asm` files that we don't want to assemble. --- .gitmodules | 2 +- Makefile | 2 +- {src/include => include}/hardware.inc | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {src/include => include}/hardware.inc (100%) diff --git a/.gitmodules b/.gitmodules index c1df895..451c628 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "src/include/hardware.inc"] - path = src/include/hardware.inc + path = include/hardware.inc url = https://github.com/gbdev/hardware.inc.git diff --git a/Makefile b/Makefile index 26c42e9..5e37c28 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ RGBGFX := ${RGBDS}rgbgfx ROM = bin/${ROMNAME}.${ROMEXT} # Argument constants -INCDIRS = src/ src/include/ +INCDIRS = src/ include/ WARNINGS = all extra ASFLAGS = -p ${PADVALUE} $(addprefix -I,${INCDIRS}) $(addprefix -W,${WARNINGS}) LDFLAGS = -p ${PADVALUE} diff --git a/src/include/hardware.inc b/include/hardware.inc similarity index 100% rename from src/include/hardware.inc rename to include/hardware.inc