diff --git a/README.md b/README.md index 09f2f85..9d43d53 100644 --- 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 index 9928b61..07614d2 100755 --- 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 b/libseven/.gitignore similarity index 100% rename from subprojects/libseven/.gitignore rename to libseven/.gitignore diff --git a/subprojects/libseven/CMakeLists.txt b/libseven/CMakeLists.txt similarity index 100% rename from subprojects/libseven/CMakeLists.txt rename to libseven/CMakeLists.txt diff --git a/subprojects/libseven/LICENSE.txt b/libseven/LICENSE.txt similarity index 100% rename from subprojects/libseven/LICENSE.txt rename to libseven/LICENSE.txt diff --git a/subprojects/libseven/Makefile b/libseven/Makefile similarity index 100% rename from subprojects/libseven/Makefile rename to libseven/Makefile diff --git a/subprojects/libseven/Makefile.dkp b/libseven/Makefile.dkp similarity index 100% rename from subprojects/libseven/Makefile.dkp rename to libseven/Makefile.dkp diff --git a/subprojects/libseven/README.md b/libseven/README.md similarity index 100% rename from subprojects/libseven/README.md rename to libseven/README.md diff --git a/subprojects/libseven/include/seven/asm/base.s b/libseven/include/seven/asm/base.s similarity index 100% rename from subprojects/libseven/include/seven/asm/base.s rename to libseven/include/seven/asm/base.s diff --git a/subprojects/libseven/include/seven/asm/hw/dma.s b/libseven/include/seven/asm/hw/dma.s similarity index 100% rename from subprojects/libseven/include/seven/asm/hw/dma.s rename to libseven/include/seven/asm/hw/dma.s diff --git a/subprojects/libseven/include/seven/asm/hw/gpio.s b/libseven/include/seven/asm/hw/gpio.s similarity index 100% rename from subprojects/libseven/include/seven/asm/hw/gpio.s rename to libseven/include/seven/asm/hw/gpio.s diff --git a/subprojects/libseven/include/seven/asm/hw/input.s b/libseven/include/seven/asm/hw/input.s similarity index 100% rename from subprojects/libseven/include/seven/asm/hw/input.s rename to libseven/include/seven/asm/hw/input.s diff --git a/subprojects/libseven/include/seven/asm/hw/irq.s b/libseven/include/seven/asm/hw/irq.s similarity index 100% rename from subprojects/libseven/include/seven/asm/hw/irq.s rename to libseven/include/seven/asm/hw/irq.s diff --git a/subprojects/libseven/include/seven/asm/hw/memory.s b/libseven/include/seven/asm/hw/memory.s similarity index 100% rename from subprojects/libseven/include/seven/asm/hw/memory.s rename to libseven/include/seven/asm/hw/memory.s diff --git a/subprojects/libseven/include/seven/asm/hw/svc.s b/libseven/include/seven/asm/hw/svc.s similarity index 100% rename from subprojects/libseven/include/seven/asm/hw/svc.s rename to libseven/include/seven/asm/hw/svc.s diff --git a/subprojects/libseven/include/seven/asm/hw/timer.s b/libseven/include/seven/asm/hw/timer.s similarity index 100% rename from subprojects/libseven/include/seven/asm/hw/timer.s rename to libseven/include/seven/asm/hw/timer.s diff --git a/subprojects/libseven/include/seven/asm/hw/video.s b/libseven/include/seven/asm/hw/video.s similarity index 100% rename from subprojects/libseven/include/seven/asm/hw/video.s rename to libseven/include/seven/asm/hw/video.s diff --git a/subprojects/libseven/include/seven/asm/hw/waitstate.s b/libseven/include/seven/asm/hw/waitstate.s similarity index 100% rename from subprojects/libseven/include/seven/asm/hw/waitstate.s rename to libseven/include/seven/asm/hw/waitstate.s diff --git a/subprojects/libseven/include/seven/asm/prelude.s b/libseven/include/seven/asm/prelude.s similarity index 100% rename from subprojects/libseven/include/seven/asm/prelude.s rename to libseven/include/seven/asm/prelude.s diff --git a/subprojects/libseven/include/seven/base.h b/libseven/include/seven/base.h similarity index 100% rename from subprojects/libseven/include/seven/base.h rename to libseven/include/seven/base.h diff --git a/subprojects/libseven/include/seven/base/addresses.h b/libseven/include/seven/base/addresses.h similarity index 100% rename from subprojects/libseven/include/seven/base/addresses.h rename to libseven/include/seven/base/addresses.h diff --git a/subprojects/libseven/include/seven/base/attributes.h b/libseven/include/seven/base/attributes.h similarity index 100% rename from subprojects/libseven/include/seven/base/attributes.h rename to libseven/include/seven/base/attributes.h diff --git a/subprojects/libseven/include/seven/base/bits.h b/libseven/include/seven/base/bits.h similarity index 100% rename from subprojects/libseven/include/seven/base/bits.h rename to libseven/include/seven/base/bits.h diff --git a/subprojects/libseven/include/seven/base/types.h b/libseven/include/seven/base/types.h similarity index 100% rename from subprojects/libseven/include/seven/base/types.h rename to libseven/include/seven/base/types.h diff --git a/subprojects/libseven/include/seven/base/version.h b/libseven/include/seven/base/version.h similarity index 100% rename from subprojects/libseven/include/seven/base/version.h rename to libseven/include/seven/base/version.h diff --git a/subprojects/libseven/include/seven/hw/cpu.h b/libseven/include/seven/hw/cpu.h similarity index 100% rename from subprojects/libseven/include/seven/hw/cpu.h rename to libseven/include/seven/hw/cpu.h diff --git a/subprojects/libseven/include/seven/hw/dma.h b/libseven/include/seven/hw/dma.h similarity index 100% rename from subprojects/libseven/include/seven/hw/dma.h rename to libseven/include/seven/hw/dma.h diff --git a/subprojects/libseven/include/seven/hw/gpio.h b/libseven/include/seven/hw/gpio.h similarity index 100% rename from subprojects/libseven/include/seven/hw/gpio.h rename to libseven/include/seven/hw/gpio.h diff --git a/subprojects/libseven/include/seven/hw/input.h b/libseven/include/seven/hw/input.h similarity index 100% rename from subprojects/libseven/include/seven/hw/input.h rename to libseven/include/seven/hw/input.h diff --git a/subprojects/libseven/include/seven/hw/irq.h b/libseven/include/seven/hw/irq.h similarity index 100% rename from subprojects/libseven/include/seven/hw/irq.h rename to libseven/include/seven/hw/irq.h diff --git a/subprojects/libseven/include/seven/hw/memory.h b/libseven/include/seven/hw/memory.h similarity index 100% rename from subprojects/libseven/include/seven/hw/memory.h rename to libseven/include/seven/hw/memory.h diff --git a/subprojects/libseven/include/seven/hw/serial.h b/libseven/include/seven/hw/serial.h similarity index 100% rename from subprojects/libseven/include/seven/hw/serial.h rename to libseven/include/seven/hw/serial.h diff --git a/subprojects/libseven/include/seven/hw/sound.h b/libseven/include/seven/hw/sound.h similarity index 100% rename from subprojects/libseven/include/seven/hw/sound.h rename to libseven/include/seven/hw/sound.h diff --git a/subprojects/libseven/include/seven/hw/sram.h b/libseven/include/seven/hw/sram.h similarity index 100% rename from subprojects/libseven/include/seven/hw/sram.h rename to libseven/include/seven/hw/sram.h diff --git a/subprojects/libseven/include/seven/hw/svc.h b/libseven/include/seven/hw/svc.h similarity index 100% rename from subprojects/libseven/include/seven/hw/svc.h rename to libseven/include/seven/hw/svc.h diff --git a/subprojects/libseven/include/seven/hw/timer.h b/libseven/include/seven/hw/timer.h similarity index 100% rename from subprojects/libseven/include/seven/hw/timer.h rename to libseven/include/seven/hw/timer.h diff --git a/subprojects/libseven/include/seven/hw/video.h b/libseven/include/seven/hw/video.h similarity index 100% rename from subprojects/libseven/include/seven/hw/video.h rename to libseven/include/seven/hw/video.h diff --git a/subprojects/libseven/include/seven/hw/waitstate.h b/libseven/include/seven/hw/waitstate.h similarity index 100% rename from subprojects/libseven/include/seven/hw/waitstate.h rename to libseven/include/seven/hw/waitstate.h diff --git a/subprojects/libseven/include/seven/prelude.h b/libseven/include/seven/prelude.h similarity index 100% rename from subprojects/libseven/include/seven/prelude.h rename to libseven/include/seven/prelude.h diff --git a/subprojects/libseven/include/seven/serial/joybus.h b/libseven/include/seven/serial/joybus.h similarity index 100% rename from subprojects/libseven/include/seven/serial/joybus.h rename to libseven/include/seven/serial/joybus.h diff --git a/subprojects/libseven/include/seven/serial/multiplayer.h b/libseven/include/seven/serial/multiplayer.h similarity index 100% rename from subprojects/libseven/include/seven/serial/multiplayer.h rename to libseven/include/seven/serial/multiplayer.h diff --git a/subprojects/libseven/include/seven/serial/raw.h b/libseven/include/seven/serial/raw.h similarity index 100% rename from subprojects/libseven/include/seven/serial/raw.h rename to libseven/include/seven/serial/raw.h diff --git a/subprojects/libseven/include/seven/serial/uart.h b/libseven/include/seven/serial/uart.h similarity index 100% rename from subprojects/libseven/include/seven/serial/uart.h rename to libseven/include/seven/serial/uart.h diff --git a/subprojects/libseven/include/seven/svc/affine.h b/libseven/include/seven/svc/affine.h similarity index 100% rename from subprojects/libseven/include/seven/svc/affine.h rename to libseven/include/seven/svc/affine.h diff --git a/subprojects/libseven/include/seven/svc/decompression.h b/libseven/include/seven/svc/decompression.h similarity index 100% rename from subprojects/libseven/include/seven/svc/decompression.h rename to libseven/include/seven/svc/decompression.h diff --git a/subprojects/libseven/include/seven/svc/math.h b/libseven/include/seven/svc/math.h similarity index 100% rename from subprojects/libseven/include/seven/svc/math.h rename to libseven/include/seven/svc/math.h diff --git a/subprojects/libseven/include/seven/svc/memory.h b/libseven/include/seven/svc/memory.h similarity index 100% rename from subprojects/libseven/include/seven/svc/memory.h rename to libseven/include/seven/svc/memory.h diff --git a/subprojects/libseven/include/seven/svc/reset.h b/libseven/include/seven/svc/reset.h similarity index 100% rename from subprojects/libseven/include/seven/svc/reset.h rename to libseven/include/seven/svc/reset.h diff --git a/subprojects/libseven/include/seven/svc/sound.h b/libseven/include/seven/svc/sound.h similarity index 100% rename from subprojects/libseven/include/seven/svc/sound.h rename to libseven/include/seven/svc/sound.h diff --git a/subprojects/libseven/include/seven/svc/system.h b/libseven/include/seven/svc/system.h similarity index 100% rename from subprojects/libseven/include/seven/svc/system.h rename to libseven/include/seven/svc/system.h diff --git a/subprojects/libseven/include/seven/svc/wait.h b/libseven/include/seven/svc/wait.h similarity index 100% rename from subprojects/libseven/include/seven/svc/wait.h rename to libseven/include/seven/svc/wait.h diff --git a/subprojects/libseven/include/seven/util/debug.h b/libseven/include/seven/util/debug.h similarity index 100% rename from subprojects/libseven/include/seven/util/debug.h rename to libseven/include/seven/util/debug.h diff --git a/subprojects/libseven/include/seven/util/log.h b/libseven/include/seven/util/log.h similarity index 100% rename from subprojects/libseven/include/seven/util/log.h rename to libseven/include/seven/util/log.h diff --git a/subprojects/libseven/include/seven/util/math.h b/libseven/include/seven/util/math.h similarity index 100% rename from subprojects/libseven/include/seven/util/math.h rename to libseven/include/seven/util/math.h diff --git a/subprojects/libseven/include/seven/util/memory.h b/libseven/include/seven/util/memory.h similarity index 100% rename from subprojects/libseven/include/seven/util/memory.h rename to libseven/include/seven/util/memory.h diff --git a/subprojects/libseven/include/seven/util/overlay.h b/libseven/include/seven/util/overlay.h similarity index 100% rename from subprojects/libseven/include/seven/util/overlay.h rename to libseven/include/seven/util/overlay.h diff --git a/subprojects/libseven/include/seven/util/profile.h b/libseven/include/seven/util/profile.h similarity index 100% rename from subprojects/libseven/include/seven/util/profile.h rename to libseven/include/seven/util/profile.h diff --git a/subprojects/libseven/include/seven/util/random.h b/libseven/include/seven/util/random.h similarity index 100% rename from subprojects/libseven/include/seven/util/random.h rename to libseven/include/seven/util/random.h diff --git a/subprojects/libseven/include/seven/util/simd.h b/libseven/include/seven/util/simd.h similarity index 100% rename from subprojects/libseven/include/seven/util/simd.h rename to libseven/include/seven/util/simd.h diff --git a/subprojects/libseven/include/seven/util/string.h b/libseven/include/seven/util/string.h similarity index 100% rename from subprojects/libseven/include/seven/util/string.h rename to libseven/include/seven/util/string.h diff --git a/subprojects/libseven/include/seven/video/bg_affine.h b/libseven/include/seven/video/bg_affine.h similarity index 100% rename from subprojects/libseven/include/seven/video/bg_affine.h rename to libseven/include/seven/video/bg_affine.h diff --git a/subprojects/libseven/include/seven/video/bg_bitmap.h b/libseven/include/seven/video/bg_bitmap.h similarity index 100% rename from subprojects/libseven/include/seven/video/bg_bitmap.h rename to libseven/include/seven/video/bg_bitmap.h diff --git a/subprojects/libseven/include/seven/video/bg_mixed.h b/libseven/include/seven/video/bg_mixed.h similarity index 100% rename from subprojects/libseven/include/seven/video/bg_mixed.h rename to libseven/include/seven/video/bg_mixed.h diff --git a/subprojects/libseven/include/seven/video/bg_regular.h b/libseven/include/seven/video/bg_regular.h similarity index 100% rename from subprojects/libseven/include/seven/video/bg_regular.h rename to libseven/include/seven/video/bg_regular.h diff --git a/subprojects/libseven/include/seven/video/bg_scroll.h b/libseven/include/seven/video/bg_scroll.h similarity index 100% rename from subprojects/libseven/include/seven/video/bg_scroll.h rename to libseven/include/seven/video/bg_scroll.h diff --git a/subprojects/libseven/include/seven/video/bg_tiled.h b/libseven/include/seven/video/bg_tiled.h similarity index 100% rename from subprojects/libseven/include/seven/video/bg_tiled.h rename to libseven/include/seven/video/bg_tiled.h diff --git a/subprojects/libseven/include/seven/video/bg_transform.h b/libseven/include/seven/video/bg_transform.h similarity index 100% rename from subprojects/libseven/include/seven/video/bg_transform.h rename to libseven/include/seven/video/bg_transform.h diff --git a/subprojects/libseven/include/seven/video/blend.h b/libseven/include/seven/video/blend.h similarity index 100% rename from subprojects/libseven/include/seven/video/blend.h rename to libseven/include/seven/video/blend.h diff --git a/subprojects/libseven/include/seven/video/color.h b/libseven/include/seven/video/color.h similarity index 100% rename from subprojects/libseven/include/seven/video/color.h rename to libseven/include/seven/video/color.h diff --git a/subprojects/libseven/include/seven/video/matrix.h b/libseven/include/seven/video/matrix.h similarity index 100% rename from subprojects/libseven/include/seven/video/matrix.h rename to libseven/include/seven/video/matrix.h diff --git a/subprojects/libseven/include/seven/video/mosaic.h b/libseven/include/seven/video/mosaic.h similarity index 100% rename from subprojects/libseven/include/seven/video/mosaic.h rename to libseven/include/seven/video/mosaic.h diff --git a/subprojects/libseven/include/seven/video/oam.h b/libseven/include/seven/video/oam.h similarity index 100% rename from subprojects/libseven/include/seven/video/oam.h rename to libseven/include/seven/video/oam.h diff --git a/subprojects/libseven/include/seven/video/object.h b/libseven/include/seven/video/object.h similarity index 100% rename from subprojects/libseven/include/seven/video/object.h rename to libseven/include/seven/video/object.h diff --git a/subprojects/libseven/include/seven/video/palette.h b/libseven/include/seven/video/palette.h similarity index 100% rename from subprojects/libseven/include/seven/video/palette.h rename to libseven/include/seven/video/palette.h diff --git a/subprojects/libseven/include/seven/video/prelude.h b/libseven/include/seven/video/prelude.h similarity index 100% rename from subprojects/libseven/include/seven/video/prelude.h rename to libseven/include/seven/video/prelude.h diff --git a/subprojects/libseven/include/seven/video/window.h b/libseven/include/seven/video/window.h similarity index 100% rename from subprojects/libseven/include/seven/video/window.h rename to libseven/include/seven/video/window.h diff --git a/subprojects/libseven/meson.build b/libseven/meson.build similarity index 67% rename from subprojects/libseven/meson.build rename to libseven/meson.build index ba9973e..ec11df1 100644 --- a/subprojects/libseven/meson.build +++ b/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 b/libseven/meta/header.h similarity index 100% rename from subprojects/libseven/meta/header.h rename to libseven/meta/header.h diff --git a/subprojects/libseven/meta/include.s b/libseven/meta/include.s similarity index 100% rename from subprojects/libseven/meta/include.s rename to libseven/meta/include.s diff --git a/subprojects/libseven/meta/source.s b/libseven/meta/source.s similarity index 100% rename from subprojects/libseven/meta/source.s rename to libseven/meta/source.s diff --git a/subprojects/libseven/src/hw/dma.s b/libseven/src/hw/dma.s similarity index 100% rename from subprojects/libseven/src/hw/dma.s rename to libseven/src/hw/dma.s diff --git a/subprojects/libseven/src/hw/input.s b/libseven/src/hw/input.s similarity index 100% rename from subprojects/libseven/src/hw/input.s rename to libseven/src/hw/input.s diff --git a/subprojects/libseven/src/hw/irq.s b/libseven/src/hw/irq.s similarity index 100% rename from subprojects/libseven/src/hw/irq.s rename to libseven/src/hw/irq.s diff --git a/subprojects/libseven/src/hw/sram.s b/libseven/src/hw/sram.s similarity index 100% rename from subprojects/libseven/src/hw/sram.s rename to libseven/src/hw/sram.s diff --git a/subprojects/libseven/src/hw/svc.s b/libseven/src/hw/svc.s similarity index 100% rename from subprojects/libseven/src/hw/svc.s rename to libseven/src/hw/svc.s diff --git a/subprojects/libseven/src/hw/timer.s b/libseven/src/hw/timer.s similarity index 100% rename from subprojects/libseven/src/hw/timer.s rename to libseven/src/hw/timer.s diff --git a/subprojects/libseven/src/macros.s b/libseven/src/macros.s similarity index 100% rename from subprojects/libseven/src/macros.s rename to libseven/src/macros.s diff --git a/subprojects/libseven/src/util/debug.s b/libseven/src/util/debug.s similarity index 100% rename from subprojects/libseven/src/util/debug.s rename to libseven/src/util/debug.s diff --git a/subprojects/libseven/src/util/log.c b/libseven/src/util/log.c similarity index 100% rename from subprojects/libseven/src/util/log.c rename to libseven/src/util/log.c diff --git a/subprojects/libseven/src/util/mem.s b/libseven/src/util/mem.s similarity index 100% rename from subprojects/libseven/src/util/mem.s rename to libseven/src/util/mem.s diff --git a/subprojects/libseven/src/util/profile.s b/libseven/src/util/profile.s similarity index 100% rename from subprojects/libseven/src/util/profile.s rename to libseven/src/util/profile.s diff --git a/subprojects/libseven/src/util/rand.s b/libseven/src/util/rand.s similarity index 100% rename from subprojects/libseven/src/util/rand.s rename to libseven/src/util/rand.s diff --git a/subprojects/libseven/src/util/simd.s b/libseven/src/util/simd.s similarity index 100% rename from subprojects/libseven/src/util/simd.s rename to libseven/src/util/simd.s diff --git a/subprojects/libseven/src/util/str.s b/libseven/src/util/str.s similarity index 100% rename from subprojects/libseven/src/util/str.s rename to libseven/src/util/str.s diff --git a/subprojects/libseven/src/video/bmp.s b/libseven/src/video/bmp.s similarity index 100% rename from subprojects/libseven/src/video/bmp.s rename to libseven/src/video/bmp.s diff --git a/subprojects/libseven/src/video/oam.s b/libseven/src/video/oam.s similarity index 100% rename from subprojects/libseven/src/video/oam.s rename to libseven/src/video/oam.s diff --git a/meson.build b/meson.build index 2093082..093d573 100644 --- 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 b/minrt/LICENSE.txt similarity index 100% rename from subprojects/minrt/LICENSE.txt rename to minrt/LICENSE.txt diff --git a/subprojects/minrt/README.md b/minrt/README.md similarity index 100% rename from subprojects/minrt/README.md rename to minrt/README.md diff --git a/subprojects/minrt/include/minrt.h b/minrt/include/minrt.h similarity index 100% rename from subprojects/minrt/include/minrt.h rename to minrt/include/minrt.h diff --git a/subprojects/minrt/lib/ldscripts/gba_base.ld b/minrt/lib/ldscripts/gba_base.ld similarity index 100% rename from subprojects/minrt/lib/ldscripts/gba_base.ld rename to minrt/lib/ldscripts/gba_base.ld diff --git a/subprojects/minrt/lib/ldscripts/multiboot.ld b/minrt/lib/ldscripts/multiboot.ld similarity index 100% rename from subprojects/minrt/lib/ldscripts/multiboot.ld rename to minrt/lib/ldscripts/multiboot.ld diff --git a/subprojects/minrt/lib/ldscripts/rom.ld b/minrt/lib/ldscripts/rom.ld similarity index 100% rename from subprojects/minrt/lib/ldscripts/rom.ld rename to minrt/lib/ldscripts/rom.ld diff --git a/subprojects/minrt/lib/ldscripts/rom_alt_wram.ld b/minrt/lib/ldscripts/rom_alt_wram.ld similarity index 100% rename from subprojects/minrt/lib/ldscripts/rom_alt_wram.ld rename to minrt/lib/ldscripts/rom_alt_wram.ld diff --git a/subprojects/minrt/lib/nocrt0.specs b/minrt/lib/nocrt0.specs similarity index 100% rename from subprojects/minrt/lib/nocrt0.specs rename to minrt/lib/nocrt0.specs diff --git a/subprojects/minrt/meson.build b/minrt/meson.build similarity index 58% rename from subprojects/minrt/meson.build rename to minrt/meson.build index 94ad1a4..fddc28b 100644 --- a/subprojects/minrt/meson.build +++ b/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 b/minrt/src/gba/crt0.s similarity index 100% rename from subprojects/minrt/src/gba/crt0.s rename to minrt/src/gba/crt0.s diff --git a/subprojects/minrt/src/gba/ram.c b/minrt/src/gba/ram.c similarity index 100% rename from subprojects/minrt/src/gba/ram.c rename to minrt/src/gba/ram.c diff --git a/subprojects/minrt/src/gba/rom_header.s b/minrt/src/gba/rom_header.s similarity index 100% rename from subprojects/minrt/src/gba/rom_header.s rename to minrt/src/gba/rom_header.s diff --git a/subprojects/minrt/src/gba/rom_header_data.s b/minrt/src/gba/rom_header_data.s similarity index 100% rename from subprojects/minrt/src/gba/rom_header_data.s rename to minrt/src/gba/rom_header_data.s diff --git a/subprojects/minrt/template/.gitignore b/minrt/template/.gitignore similarity index 100% rename from subprojects/minrt/template/.gitignore rename to minrt/template/.gitignore diff --git a/subprojects/minrt/template/Makefile b/minrt/template/Makefile similarity index 100% rename from subprojects/minrt/template/Makefile rename to minrt/template/Makefile diff --git a/subprojects/minrt/template/src/main.c b/minrt/template/src/main.c similarity index 100% rename from subprojects/minrt/template/src/main.c rename to minrt/template/src/main.c