desubprojectify

LunarLambda · Nov 12, 2022 · b9c43bf · b9c43bf
1 parent fa1631c
commit b9c43bf
Show file tree

Hide file tree

Showing 113 changed files with 24 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ## Requires
 
-- meson >=0.56.0
+- meson >=0.60.0
 - arm-none-eabi toolchain (gcc, binutils, newlib)
 - native C compiler
 

diff --git a/dist.sh b/dist.sh
@@ -1,19 +1,21 @@
 #!/bin/sh
 
+DIST=$PWD/dist
+
 (
 PROJECT=libseven
 VERSION=0.7.1
-cd subprojects/$PROJECT
-git archive -o ../../dist/$PROJECT-$VERSION.zip --prefix=$PROJECT-$VERSION/ HEAD .
-cd ../../dist
+cd $PROJECT
+git archive -o $DIST/$PROJECT-$VERSION.zip --prefix=$PROJECT-$VERSION/ HEAD .
+cd $DIST
 sha256sum -b $PROJECT-$VERSION.zip > $PROJECT-$VERSION.zip.sha256sum
 )
 
 (
 PROJECT=minrt
 VERSION=0.2.0
-cd subprojects/$PROJECT
-git archive -o ../../dist/$PROJECT-$VERSION.zip --prefix=$PROJECT-$VERSION/ HEAD .
-cd ../../dist
+cd $PROJECT
+git archive -o $DIST/dist/$PROJECT-$VERSION.zip --prefix=$PROJECT-$VERSION/ HEAD .
+cd $DIST
 sha256sum -b $PROJECT-$VERSION.zip > $PROJECT-$VERSION.zip.sha256sum
 )
diff --git a/subprojects/libseven/.gitignore → libseven/.gitignore b/subprojects/libseven/.gitignore → libseven/.gitignore
diff --git a/subprojects/libseven/CMakeLists.txt → libseven/CMakeLists.txt b/subprojects/libseven/CMakeLists.txt → libseven/CMakeLists.txt
diff --git a/subprojects/libseven/LICENSE.txt → libseven/LICENSE.txt b/subprojects/libseven/LICENSE.txt → libseven/LICENSE.txt
diff --git a/subprojects/libseven/Makefile → libseven/Makefile b/subprojects/libseven/Makefile → libseven/Makefile
diff --git a/subprojects/libseven/Makefile.dkp → libseven/Makefile.dkp b/subprojects/libseven/Makefile.dkp → libseven/Makefile.dkp
diff --git a/subprojects/libseven/README.md → libseven/README.md b/subprojects/libseven/README.md → libseven/README.md
diff --git a/...rojects/libseven/include/seven/asm/base.s → libseven/include/seven/asm/base.s b/...rojects/libseven/include/seven/asm/base.s → libseven/include/seven/asm/base.s
diff --git a/...jects/libseven/include/seven/asm/hw/dma.s → libseven/include/seven/asm/hw/dma.s b/...jects/libseven/include/seven/asm/hw/dma.s → libseven/include/seven/asm/hw/dma.s
diff --git a/...ects/libseven/include/seven/asm/hw/gpio.s → libseven/include/seven/asm/hw/gpio.s b/...ects/libseven/include/seven/asm/hw/gpio.s → libseven/include/seven/asm/hw/gpio.s
diff --git a/...cts/libseven/include/seven/asm/hw/input.s → libseven/include/seven/asm/hw/input.s b/...cts/libseven/include/seven/asm/hw/input.s → libseven/include/seven/asm/hw/input.s
diff --git a/...jects/libseven/include/seven/asm/hw/irq.s → libseven/include/seven/asm/hw/irq.s b/...jects/libseven/include/seven/asm/hw/irq.s → libseven/include/seven/asm/hw/irq.s
diff --git a/...ts/libseven/include/seven/asm/hw/memory.s → libseven/include/seven/asm/hw/memory.s b/...ts/libseven/include/seven/asm/hw/memory.s → libseven/include/seven/asm/hw/memory.s
diff --git a/...jects/libseven/include/seven/asm/hw/svc.s → libseven/include/seven/asm/hw/svc.s b/...jects/libseven/include/seven/asm/hw/svc.s → libseven/include/seven/asm/hw/svc.s
diff --git a/...cts/libseven/include/seven/asm/hw/timer.s → libseven/include/seven/asm/hw/timer.s b/...cts/libseven/include/seven/asm/hw/timer.s → libseven/include/seven/asm/hw/timer.s
diff --git a/...cts/libseven/include/seven/asm/hw/video.s → libseven/include/seven/asm/hw/video.s b/...cts/libseven/include/seven/asm/hw/video.s → libseven/include/seven/asm/hw/video.s
diff --git a/...libseven/include/seven/asm/hw/waitstate.s → libseven/include/seven/asm/hw/waitstate.s b/...libseven/include/seven/asm/hw/waitstate.s → libseven/include/seven/asm/hw/waitstate.s
diff --git a/...ects/libseven/include/seven/asm/prelude.s → libseven/include/seven/asm/prelude.s b/...ects/libseven/include/seven/asm/prelude.s → libseven/include/seven/asm/prelude.s
diff --git a/subprojects/libseven/include/seven/base.h → libseven/include/seven/base.h b/subprojects/libseven/include/seven/base.h → libseven/include/seven/base.h
diff --git a/...s/libseven/include/seven/base/addresses.h → libseven/include/seven/base/addresses.h b/...s/libseven/include/seven/base/addresses.h → libseven/include/seven/base/addresses.h
diff --git a/.../libseven/include/seven/base/attributes.h → libseven/include/seven/base/attributes.h b/.../libseven/include/seven/base/attributes.h → libseven/include/seven/base/attributes.h
diff --git a/...ojects/libseven/include/seven/base/bits.h → libseven/include/seven/base/bits.h b/...ojects/libseven/include/seven/base/bits.h → libseven/include/seven/base/bits.h
diff --git a/...jects/libseven/include/seven/base/types.h → libseven/include/seven/base/types.h b/...jects/libseven/include/seven/base/types.h → libseven/include/seven/base/types.h
diff --git a/...cts/libseven/include/seven/base/version.h → libseven/include/seven/base/version.h b/...cts/libseven/include/seven/base/version.h → libseven/include/seven/base/version.h
diff --git a/subprojects/libseven/include/seven/hw/cpu.h → libseven/include/seven/hw/cpu.h b/subprojects/libseven/include/seven/hw/cpu.h → libseven/include/seven/hw/cpu.h
diff --git a/subprojects/libseven/include/seven/hw/dma.h → libseven/include/seven/hw/dma.h b/subprojects/libseven/include/seven/hw/dma.h → libseven/include/seven/hw/dma.h
diff --git a/subprojects/libseven/include/seven/hw/gpio.h → libseven/include/seven/hw/gpio.h b/subprojects/libseven/include/seven/hw/gpio.h → libseven/include/seven/hw/gpio.h
diff --git a/...rojects/libseven/include/seven/hw/input.h → libseven/include/seven/hw/input.h b/...rojects/libseven/include/seven/hw/input.h → libseven/include/seven/hw/input.h
diff --git a/subprojects/libseven/include/seven/hw/irq.h → libseven/include/seven/hw/irq.h b/subprojects/libseven/include/seven/hw/irq.h → libseven/include/seven/hw/irq.h
diff --git a/...ojects/libseven/include/seven/hw/memory.h → libseven/include/seven/hw/memory.h b/...ojects/libseven/include/seven/hw/memory.h → libseven/include/seven/hw/memory.h
diff --git a/...ojects/libseven/include/seven/hw/serial.h → libseven/include/seven/hw/serial.h b/...ojects/libseven/include/seven/hw/serial.h → libseven/include/seven/hw/serial.h
diff --git a/...rojects/libseven/include/seven/hw/sound.h → libseven/include/seven/hw/sound.h b/...rojects/libseven/include/seven/hw/sound.h → libseven/include/seven/hw/sound.h
diff --git a/subprojects/libseven/include/seven/hw/sram.h → libseven/include/seven/hw/sram.h b/subprojects/libseven/include/seven/hw/sram.h → libseven/include/seven/hw/sram.h
diff --git a/subprojects/libseven/include/seven/hw/svc.h → libseven/include/seven/hw/svc.h b/subprojects/libseven/include/seven/hw/svc.h → libseven/include/seven/hw/svc.h
diff --git a/...rojects/libseven/include/seven/hw/timer.h → libseven/include/seven/hw/timer.h b/...rojects/libseven/include/seven/hw/timer.h → libseven/include/seven/hw/timer.h
diff --git a/...rojects/libseven/include/seven/hw/video.h → libseven/include/seven/hw/video.h b/...rojects/libseven/include/seven/hw/video.h → libseven/include/seven/hw/video.h
diff --git a/...cts/libseven/include/seven/hw/waitstate.h → libseven/include/seven/hw/waitstate.h b/...cts/libseven/include/seven/hw/waitstate.h → libseven/include/seven/hw/waitstate.h
diff --git a/subprojects/libseven/include/seven/prelude.h → libseven/include/seven/prelude.h b/subprojects/libseven/include/seven/prelude.h → libseven/include/seven/prelude.h
diff --git a/...ts/libseven/include/seven/serial/joybus.h → libseven/include/seven/serial/joybus.h b/...ts/libseven/include/seven/serial/joybus.h → libseven/include/seven/serial/joybus.h
diff --git a/...bseven/include/seven/serial/multiplayer.h → libseven/include/seven/serial/multiplayer.h b/...bseven/include/seven/serial/multiplayer.h → libseven/include/seven/serial/multiplayer.h
diff --git a/...jects/libseven/include/seven/serial/raw.h → libseven/include/seven/serial/raw.h b/...jects/libseven/include/seven/serial/raw.h → libseven/include/seven/serial/raw.h
diff --git a/...ects/libseven/include/seven/serial/uart.h → libseven/include/seven/serial/uart.h b/...ects/libseven/include/seven/serial/uart.h → libseven/include/seven/serial/uart.h
diff --git a/...jects/libseven/include/seven/svc/affine.h → libseven/include/seven/svc/affine.h b/...jects/libseven/include/seven/svc/affine.h → libseven/include/seven/svc/affine.h
diff --git a/...ibseven/include/seven/svc/decompression.h → libseven/include/seven/svc/decompression.h b/...ibseven/include/seven/svc/decompression.h → libseven/include/seven/svc/decompression.h
diff --git a/...rojects/libseven/include/seven/svc/math.h → libseven/include/seven/svc/math.h b/...rojects/libseven/include/seven/svc/math.h → libseven/include/seven/svc/math.h
diff --git a/...jects/libseven/include/seven/svc/memory.h → libseven/include/seven/svc/memory.h b/...jects/libseven/include/seven/svc/memory.h → libseven/include/seven/svc/memory.h
diff --git a/...ojects/libseven/include/seven/svc/reset.h → libseven/include/seven/svc/reset.h b/...ojects/libseven/include/seven/svc/reset.h → libseven/include/seven/svc/reset.h
diff --git a/...ojects/libseven/include/seven/svc/sound.h → libseven/include/seven/svc/sound.h b/...ojects/libseven/include/seven/svc/sound.h → libseven/include/seven/svc/sound.h
diff --git a/...jects/libseven/include/seven/svc/system.h → libseven/include/seven/svc/system.h b/...jects/libseven/include/seven/svc/system.h → libseven/include/seven/svc/system.h
diff --git a/...rojects/libseven/include/seven/svc/wait.h → libseven/include/seven/svc/wait.h b/...rojects/libseven/include/seven/svc/wait.h → libseven/include/seven/svc/wait.h
diff --git a/...jects/libseven/include/seven/util/debug.h → libseven/include/seven/util/debug.h b/...jects/libseven/include/seven/util/debug.h → libseven/include/seven/util/debug.h
diff --git a/...rojects/libseven/include/seven/util/log.h → libseven/include/seven/util/log.h b/...rojects/libseven/include/seven/util/log.h → libseven/include/seven/util/log.h
diff --git a/...ojects/libseven/include/seven/util/math.h → libseven/include/seven/util/math.h b/...ojects/libseven/include/seven/util/math.h → libseven/include/seven/util/math.h
diff --git a/...ects/libseven/include/seven/util/memory.h → libseven/include/seven/util/memory.h b/...ects/libseven/include/seven/util/memory.h → libseven/include/seven/util/memory.h
diff --git a/...cts/libseven/include/seven/util/overlay.h → libseven/include/seven/util/overlay.h b/...cts/libseven/include/seven/util/overlay.h → libseven/include/seven/util/overlay.h
diff --git a/...cts/libseven/include/seven/util/profile.h → libseven/include/seven/util/profile.h b/...cts/libseven/include/seven/util/profile.h → libseven/include/seven/util/profile.h
diff --git a/...ects/libseven/include/seven/util/random.h → libseven/include/seven/util/random.h b/...ects/libseven/include/seven/util/random.h → libseven/include/seven/util/random.h
diff --git a/...ojects/libseven/include/seven/util/simd.h → libseven/include/seven/util/simd.h b/...ojects/libseven/include/seven/util/simd.h → libseven/include/seven/util/simd.h
diff --git a/...ects/libseven/include/seven/util/string.h → libseven/include/seven/util/string.h b/...ects/libseven/include/seven/util/string.h → libseven/include/seven/util/string.h
diff --git a/.../libseven/include/seven/video/bg_affine.h → libseven/include/seven/video/bg_affine.h b/.../libseven/include/seven/video/bg_affine.h → libseven/include/seven/video/bg_affine.h
diff --git a/.../libseven/include/seven/video/bg_bitmap.h → libseven/include/seven/video/bg_bitmap.h b/.../libseven/include/seven/video/bg_bitmap.h → libseven/include/seven/video/bg_bitmap.h
diff --git a/...s/libseven/include/seven/video/bg_mixed.h → libseven/include/seven/video/bg_mixed.h b/...s/libseven/include/seven/video/bg_mixed.h → libseven/include/seven/video/bg_mixed.h
diff --git a/...libseven/include/seven/video/bg_regular.h → libseven/include/seven/video/bg_regular.h b/...libseven/include/seven/video/bg_regular.h → libseven/include/seven/video/bg_regular.h
diff --git a/.../libseven/include/seven/video/bg_scroll.h → libseven/include/seven/video/bg_scroll.h b/.../libseven/include/seven/video/bg_scroll.h → libseven/include/seven/video/bg_scroll.h
diff --git a/...s/libseven/include/seven/video/bg_tiled.h → libseven/include/seven/video/bg_tiled.h b/...s/libseven/include/seven/video/bg_tiled.h → libseven/include/seven/video/bg_tiled.h
diff --git a/...bseven/include/seven/video/bg_transform.h → libseven/include/seven/video/bg_transform.h b/...bseven/include/seven/video/bg_transform.h → libseven/include/seven/video/bg_transform.h
diff --git a/...ects/libseven/include/seven/video/blend.h → libseven/include/seven/video/blend.h b/...ects/libseven/include/seven/video/blend.h → libseven/include/seven/video/blend.h
diff --git a/...ects/libseven/include/seven/video/color.h → libseven/include/seven/video/color.h b/...ects/libseven/include/seven/video/color.h → libseven/include/seven/video/color.h
diff --git a/...cts/libseven/include/seven/video/matrix.h → libseven/include/seven/video/matrix.h b/...cts/libseven/include/seven/video/matrix.h → libseven/include/seven/video/matrix.h
diff --git a/...cts/libseven/include/seven/video/mosaic.h → libseven/include/seven/video/mosaic.h b/...cts/libseven/include/seven/video/mosaic.h → libseven/include/seven/video/mosaic.h
diff --git a/...ojects/libseven/include/seven/video/oam.h → libseven/include/seven/video/oam.h b/...ojects/libseven/include/seven/video/oam.h → libseven/include/seven/video/oam.h
diff --git a/...cts/libseven/include/seven/video/object.h → libseven/include/seven/video/object.h b/...cts/libseven/include/seven/video/object.h → libseven/include/seven/video/object.h
diff --git a/...ts/libseven/include/seven/video/palette.h → libseven/include/seven/video/palette.h b/...ts/libseven/include/seven/video/palette.h → libseven/include/seven/video/palette.h
diff --git a/...ts/libseven/include/seven/video/prelude.h → libseven/include/seven/video/prelude.h b/...ts/libseven/include/seven/video/prelude.h → libseven/include/seven/video/prelude.h
diff --git a/...cts/libseven/include/seven/video/window.h → libseven/include/seven/video/window.h b/...cts/libseven/include/seven/video/window.h → libseven/include/seven/video/window.h
diff --git a/subprojects/libseven/meson.build → libseven/meson.build b/subprojects/libseven/meson.build → libseven/meson.build
@@ -1,8 +1,3 @@
-project('libseven', 'c',
-  version: '0.7.1',
-  license: 'MPL-2.0',
-  default_options: ['warning_level=2', 'c_std=c99'])
-
 sources = [
   'src/hw/dma.s',
   'src/hw/input.s',
@@ -26,12 +21,11 @@ includes = ['include']
 libseven = static_library(
   'seven',
   sources,
-  include_directories: includes + 'src',
-  c_args: ['-mthumb', '-ffunction-sections', '-fdata-sections'])
-
+  include_directories: includes + 'src')
 
 libseven_dep = declare_dependency(
   include_directories: includes,
-  link_with: libseven)
+  link_with: libseven,
+  version: '0.7.1')
 
 meson.override_dependency('libseven', libseven_dep)
diff --git a/subprojects/libseven/meta/header.h → libseven/meta/header.h b/subprojects/libseven/meta/header.h → libseven/meta/header.h
diff --git a/subprojects/libseven/meta/include.s → libseven/meta/include.s b/subprojects/libseven/meta/include.s → libseven/meta/include.s
diff --git a/subprojects/libseven/meta/source.s → libseven/meta/source.s b/subprojects/libseven/meta/source.s → libseven/meta/source.s
diff --git a/subprojects/libseven/src/hw/dma.s → libseven/src/hw/dma.s b/subprojects/libseven/src/hw/dma.s → libseven/src/hw/dma.s
diff --git a/subprojects/libseven/src/hw/input.s → libseven/src/hw/input.s b/subprojects/libseven/src/hw/input.s → libseven/src/hw/input.s
diff --git a/subprojects/libseven/src/hw/irq.s → libseven/src/hw/irq.s b/subprojects/libseven/src/hw/irq.s → libseven/src/hw/irq.s
diff --git a/subprojects/libseven/src/hw/sram.s → libseven/src/hw/sram.s b/subprojects/libseven/src/hw/sram.s → libseven/src/hw/sram.s
diff --git a/subprojects/libseven/src/hw/svc.s → libseven/src/hw/svc.s b/subprojects/libseven/src/hw/svc.s → libseven/src/hw/svc.s
diff --git a/subprojects/libseven/src/hw/timer.s → libseven/src/hw/timer.s b/subprojects/libseven/src/hw/timer.s → libseven/src/hw/timer.s
diff --git a/subprojects/libseven/src/macros.s → libseven/src/macros.s b/subprojects/libseven/src/macros.s → libseven/src/macros.s
diff --git a/subprojects/libseven/src/util/debug.s → libseven/src/util/debug.s b/subprojects/libseven/src/util/debug.s → libseven/src/util/debug.s
diff --git a/subprojects/libseven/src/util/log.c → libseven/src/util/log.c b/subprojects/libseven/src/util/log.c → libseven/src/util/log.c
diff --git a/subprojects/libseven/src/util/mem.s → libseven/src/util/mem.s b/subprojects/libseven/src/util/mem.s → libseven/src/util/mem.s
diff --git a/subprojects/libseven/src/util/profile.s → libseven/src/util/profile.s b/subprojects/libseven/src/util/profile.s → libseven/src/util/profile.s
diff --git a/subprojects/libseven/src/util/rand.s → libseven/src/util/rand.s b/subprojects/libseven/src/util/rand.s → libseven/src/util/rand.s
diff --git a/subprojects/libseven/src/util/simd.s → libseven/src/util/simd.s b/subprojects/libseven/src/util/simd.s → libseven/src/util/simd.s
diff --git a/subprojects/libseven/src/util/str.s → libseven/src/util/str.s b/subprojects/libseven/src/util/str.s → libseven/src/util/str.s
diff --git a/subprojects/libseven/src/video/bmp.s → libseven/src/video/bmp.s b/subprojects/libseven/src/video/bmp.s → libseven/src/video/bmp.s
diff --git a/subprojects/libseven/src/video/oam.s → libseven/src/video/oam.s b/subprojects/libseven/src/video/oam.s → libseven/src/video/oam.s
diff --git a/meson.build b/meson.build
@@ -1,7 +1,8 @@
 project('sdk-seven', 'c',
-  version: '0.2.0',
+  version: '0.3.0',
   license: 'Zlib',
-  meson_version: '>=0.56.0')
+  meson_version: '>=0.60.0',
+  default_options: ['warning_level=2', 'c_std=c99'])
 
 add_project_arguments(
   '-mthumb',
@@ -25,8 +26,8 @@ if cc.has_argument('-specs=nano.specs')
     language: 'c')
 endif
 
-subproject('libseven')
-subproject('minrt')
+subdir('libseven')
+subdir('minrt')
 
 subdir('tools')
 

diff --git a/subprojects/minrt/LICENSE.txt → minrt/LICENSE.txt b/subprojects/minrt/LICENSE.txt → minrt/LICENSE.txt
diff --git a/subprojects/minrt/README.md → minrt/README.md b/subprojects/minrt/README.md → minrt/README.md
diff --git a/subprojects/minrt/include/minrt.h → minrt/include/minrt.h b/subprojects/minrt/include/minrt.h → minrt/include/minrt.h
diff --git a/subprojects/minrt/lib/ldscripts/gba_base.ld → minrt/lib/ldscripts/gba_base.ld b/subprojects/minrt/lib/ldscripts/gba_base.ld → minrt/lib/ldscripts/gba_base.ld
diff --git a/subprojects/minrt/lib/ldscripts/multiboot.ld → minrt/lib/ldscripts/multiboot.ld b/subprojects/minrt/lib/ldscripts/multiboot.ld → minrt/lib/ldscripts/multiboot.ld
diff --git a/subprojects/minrt/lib/ldscripts/rom.ld → minrt/lib/ldscripts/rom.ld b/subprojects/minrt/lib/ldscripts/rom.ld → minrt/lib/ldscripts/rom.ld
diff --git a/...jects/minrt/lib/ldscripts/rom_alt_wram.ld → minrt/lib/ldscripts/rom_alt_wram.ld b/...jects/minrt/lib/ldscripts/rom_alt_wram.ld → minrt/lib/ldscripts/rom_alt_wram.ld
diff --git a/subprojects/minrt/lib/nocrt0.specs → minrt/lib/nocrt0.specs b/subprojects/minrt/lib/nocrt0.specs → minrt/lib/nocrt0.specs
diff --git a/subprojects/minrt/meson.build → minrt/meson.build b/subprojects/minrt/meson.build → minrt/meson.build
@@ -1,7 +1,4 @@
-project('minrt', 'c',
-  version: '0.2.0',
-  license: 'MPL-2.0',
-  default_options: ['warning_level=2', 'c_std=c99'])
+version = '0.2.0'
 
 sources = [
   'src/gba/rom_header.s',
@@ -11,25 +8,26 @@ sources = [
 
 includes = ['include']
 
-lib = meson.project_source_root() / 'lib'
+lib = meson.current_source_dir() / 'lib'
 
 link_args = ['-specs=' + lib / 'nocrt0.specs', '-L' + lib / 'ldscripts']
 
 minrt = static_library(
   'minrt',
   sources,
-  include_directories: includes + 'src' + 'src/gba',
-  c_args: ['-mthumb', '-ffunction-sections', '-fdata-sections'])
+  include_directories: includes + 'src' + 'src/gba')
 
 minrt_dep = declare_dependency(
   include_directories: includes,
   link_with: minrt,
-  link_args: link_args + '-Trom.ld')
+  link_args: link_args + '-Trom.ld',
+  version: version)
 
 minrt_mb_dep = declare_dependency(
   include_directories: includes,
   link_with: minrt,
-  link_args: link_args + '-Tmultiboot.ld')
+  link_args: link_args + '-Tmultiboot.ld',
+  version: version)
 
 meson.override_dependency('minrt', minrt_dep)
 meson.override_dependency('minrt-multiboot', minrt_mb_dep)
diff --git a/subprojects/minrt/src/gba/crt0.s → minrt/src/gba/crt0.s b/subprojects/minrt/src/gba/crt0.s → minrt/src/gba/crt0.s
diff --git a/subprojects/minrt/src/gba/ram.c → minrt/src/gba/ram.c b/subprojects/minrt/src/gba/ram.c → minrt/src/gba/ram.c
diff --git a/subprojects/minrt/src/gba/rom_header.s → minrt/src/gba/rom_header.s b/subprojects/minrt/src/gba/rom_header.s → minrt/src/gba/rom_header.s
diff --git a/subprojects/minrt/src/gba/rom_header_data.s → minrt/src/gba/rom_header_data.s b/subprojects/minrt/src/gba/rom_header_data.s → minrt/src/gba/rom_header_data.s
diff --git a/subprojects/minrt/template/.gitignore → minrt/template/.gitignore b/subprojects/minrt/template/.gitignore → minrt/template/.gitignore
diff --git a/subprojects/minrt/template/Makefile → minrt/template/Makefile b/subprojects/minrt/template/Makefile → minrt/template/Makefile
diff --git a/subprojects/minrt/template/src/main.c → minrt/template/src/main.c b/subprojects/minrt/template/src/main.c → minrt/template/src/main.c