From 040a70ee51577710ee025745d696f1023dc4c0c9 Mon Sep 17 00:00:00 2001 From: Zack Buhman Date: Thu, 26 Jun 2025 16:08:10 -0500 Subject: [PATCH] rename tracker_scene to scene/tracker --- Makefile | 3 +-- src/graphics.cpp | 2 +- src/{tracker_scene => scene/tracker}/channel_status.cpp | 9 ++++----- src/{tracker_scene => scene/tracker}/channel_status.hpp | 0 src/{tracker_scene => scene/tracker}/notes.cpp | 6 +++--- src/{tracker_scene => scene/tracker}/notes.hpp | 0 src/{tracker_scene => scene/tracker}/scene.cpp | 2 +- src/{tracker_scene => scene/tracker}/scene.hpp | 0 xm_player.mk | 6 +++--- 9 files changed, 13 insertions(+), 15 deletions(-) rename src/{tracker_scene => scene/tracker}/channel_status.cpp (95%) rename src/{tracker_scene => scene/tracker}/channel_status.hpp (100%) rename src/{tracker_scene => scene/tracker}/notes.cpp (98%) rename src/{tracker_scene => scene/tracker}/notes.hpp (100%) rename src/{tracker_scene => scene/tracker}/scene.cpp (97%) rename src/{tracker_scene => scene/tracker}/scene.hpp (100%) diff --git a/Makefile b/Makefile index 204db6c..dbeb322 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,7 @@ OPT = -O2 MAKEFILE_PATH := $(patsubst %/,%,$(dir $(abspath $(firstword $(MAKEFILE_LIST))))) LIB ?= $(MAKEFILE_PATH)/dreamcast -CFLAGS += -D__dreamcast__ -CFLAGS += -I$(MAKEFILE_PATH)/ +CFLAGS += -I$(MAKEFILE_PATH) CFLAGS += -I$(MAKEFILE_PATH)/dreamcast CFLAGS += -Wno-error=strict-aliasing -fno-strict-aliasing CARCH = -m4-single -ml diff --git a/src/graphics.cpp b/src/graphics.cpp index 394b38d..2f9eabd 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -25,7 +25,7 @@ #include "font/tandy1k.data.h" #include "framebuffer.hpp" -#include "src/tracker_scene/scene.hpp" +#include "src/scene/tracker/scene.hpp" constexpr uint32_t ta_alloc = 0 | ta_alloc_ctrl::pt_opb::_32x4byte diff --git a/src/tracker_scene/channel_status.cpp b/src/scene/tracker/channel_status.cpp similarity index 95% rename from src/tracker_scene/channel_status.cpp rename to src/scene/tracker/channel_status.cpp index df0d114..41b92d8 100644 --- a/src/tracker_scene/channel_status.cpp +++ b/src/scene/tracker/channel_status.cpp @@ -1,8 +1,7 @@ -#include "../ta_parameter.hpp" - -#include "../graphics_primitive.hpp" -#include "../interpreter.hpp" -#include "../framebuffer.hpp" +#include "../../ta_parameter.hpp" +#include "../../graphics_primitive.hpp" +#include "../../interpreter.hpp" +#include "../../framebuffer.hpp" #include "channel_status.hpp" diff --git a/src/tracker_scene/channel_status.hpp b/src/scene/tracker/channel_status.hpp similarity index 100% rename from src/tracker_scene/channel_status.hpp rename to src/scene/tracker/channel_status.hpp diff --git a/src/tracker_scene/notes.cpp b/src/scene/tracker/notes.cpp similarity index 98% rename from src/tracker_scene/notes.cpp rename to src/scene/tracker/notes.cpp index 085cb66..8b67d6a 100644 --- a/src/tracker_scene/notes.cpp +++ b/src/scene/tracker/notes.cpp @@ -1,7 +1,7 @@ -#include "../ta_parameter.hpp" +#include "../../ta_parameter.hpp" -#include "../graphics_primitive.hpp" -#include "../interpreter.hpp" +#include "../../graphics_primitive.hpp" +#include "../../interpreter.hpp" #include "notes.hpp" diff --git a/src/tracker_scene/notes.hpp b/src/scene/tracker/notes.hpp similarity index 100% rename from src/tracker_scene/notes.hpp rename to src/scene/tracker/notes.hpp diff --git a/src/tracker_scene/scene.cpp b/src/scene/tracker/scene.cpp similarity index 97% rename from src/tracker_scene/scene.cpp rename to src/scene/tracker/scene.cpp index f54995a..bea98bd 100644 --- a/src/tracker_scene/scene.cpp +++ b/src/scene/tracker/scene.cpp @@ -1,4 +1,4 @@ -#include "../ta_parameter.hpp" +#include "../../ta_parameter.hpp" #include "notes.hpp" #include "channel_status.hpp" diff --git a/src/tracker_scene/scene.hpp b/src/scene/tracker/scene.hpp similarity index 100% rename from src/tracker_scene/scene.hpp rename to src/scene/tracker/scene.hpp diff --git a/xm_player.mk b/xm_player.mk index 73da7e7..1c23587 100644 --- a/xm_player.mk +++ b/xm_player.mk @@ -24,9 +24,9 @@ XM_PLAYER_OBJ = \ src/malloc.o \ src/framebuffer.o \ src/graphics_primitive.o \ - src/tracker_scene/scene.o \ - src/tracker_scene/channel_status.o \ - src/tracker_scene/notes.o + src/scene/tracker/scene.o \ + src/scene/tracker/channel_status.o \ + src/scene/tracker/notes.o xm_player.elf: LDSCRIPT = $(LIB)/main.lds xm_player.elf: $(START_OBJ) $(XM_PLAYER_OBJ) $(TEXTURE_OBJ) $(XM_OBJ) $(LIBGCC)