From faa4324518faff516dda6cbfa7a7fe224d642e85 Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 11 Nov 2023 19:21:59 -0500 Subject: [PATCH] Move `AssemblerEditor` to modules --- src/CMakeLists.txt | 2 +- src/app/editor/master_editor.cc | 2 +- src/app/editor/master_editor.h | 2 +- src/app/editor/{ => modules}/assembly_editor.cc | 0 src/app/editor/{ => modules}/assembly_editor.h | 0 src/app/editor/music_editor.cc | 2 +- src/app/editor/music_editor.h | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename src/app/editor/{ => modules}/assembly_editor.cc (100%) rename src/app/editor/{ => modules}/assembly_editor.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5f695980..3c314552 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,6 @@ set( set( YAZE_APP_EDITOR_SRC - app/editor/assembly_editor.cc app/editor/dungeon_editor.cc app/editor/graphics_editor.cc app/editor/master_editor.cc @@ -17,6 +16,7 @@ set( app/editor/palette_editor.cc app/editor/screen_editor.cc app/editor/sprite_editor.cc + app/editor/modules/assembly_editor.cc app/editor/modules/tile16_editor.cc app/editor/modules/gfx_group_editor.cc ) diff --git a/src/app/editor/master_editor.cc b/src/app/editor/master_editor.cc index 527af004..2f9d5ff1 100644 --- a/src/app/editor/master_editor.cc +++ b/src/app/editor/master_editor.cc @@ -9,8 +9,8 @@ #include "absl/status/status.h" #include "app/core/constants.h" #include "app/core/pipeline.h" -#include "app/editor/assembly_editor.h" #include "app/editor/dungeon_editor.h" +#include "app/editor/modules/assembly_editor.h" #include "app/editor/music_editor.h" #include "app/editor/overworld_editor.h" #include "app/gfx/snes_palette.h" diff --git a/src/app/editor/master_editor.h b/src/app/editor/master_editor.h index 0ba0d887..b234e240 100644 --- a/src/app/editor/master_editor.h +++ b/src/app/editor/master_editor.h @@ -12,9 +12,9 @@ #include "app/core/constants.h" #include "app/core/emulator.h" #include "app/core/pipeline.h" -#include "app/editor/assembly_editor.h" #include "app/editor/dungeon_editor.h" #include "app/editor/graphics_editor.h" +#include "app/editor/modules/assembly_editor.h" #include "app/editor/music_editor.h" #include "app/editor/overworld_editor.h" #include "app/editor/palette_editor.h" diff --git a/src/app/editor/assembly_editor.cc b/src/app/editor/modules/assembly_editor.cc similarity index 100% rename from src/app/editor/assembly_editor.cc rename to src/app/editor/modules/assembly_editor.cc diff --git a/src/app/editor/assembly_editor.h b/src/app/editor/modules/assembly_editor.h similarity index 100% rename from src/app/editor/assembly_editor.h rename to src/app/editor/modules/assembly_editor.h diff --git a/src/app/editor/music_editor.cc b/src/app/editor/music_editor.cc index cebd7dfb..e29f2c7f 100644 --- a/src/app/editor/music_editor.cc +++ b/src/app/editor/music_editor.cc @@ -4,7 +4,7 @@ #include #include "absl/strings/str_format.h" -#include "app/editor/assembly_editor.h" +#include "app/editor/modules/assembly_editor.h" #include "app/gui/canvas.h" #include "app/gui/icons.h" #include "app/gui/input.h" diff --git a/src/app/editor/music_editor.h b/src/app/editor/music_editor.h index d3f0cac3..f860bfda 100644 --- a/src/app/editor/music_editor.h +++ b/src/app/editor/music_editor.h @@ -5,7 +5,7 @@ #include #include "absl/strings/str_format.h" -#include "app/editor/assembly_editor.h" +#include "app/editor/modules/assembly_editor.h" #include "app/gui/canvas.h" #include "app/gui/icons.h" #include "app/gui/input.h"