refactor version numbers and toolchain flags

dist.sh

@@ -12,5 +12,5 @@ make_dist() {
 
 [ ! -d "$DIST" ] && mkdir "$DIST" || rm "$DIST"/*
 
-(PROJECT=libseven VERSION=0.17.1 make_dist)
+(PROJECT=libseven VERSION=0.17.2 make_dist)
 (PROJECT=minrt VERSION=0.7.3 make_dist)

libseven/include/seven/base.h

@@ -26,7 +26,7 @@
 
 #define LIBSEVEN_VERSION_MAJOR 0
 #define LIBSEVEN_VERSION_MINOR 17
-#define LIBSEVEN_VERSION_PATCH 1
+#define LIBSEVEN_VERSION_PATCH 2
 
 #define LIBSEVEN_VERSION \
  _LIBSEVEN_STR2(LIBSEVEN_VERSION_MAJOR) "." \

libseven/meson.build

@@ -1,5 +1,3 @@
-version = '0.17.1'
-
 sources = [
  'src/hw/bios.s',
  'src/hw/dma.s',
@@ -33,6 +31,6 @@ install_subdir('include/seven', install_dir: get_option('includedir'))
 libseven_dep = declare_dependency(
  include_directories: includes,
  link_with: libseven,
- version: version)
+ version: libseven_version)
 
 meson.override_dependency('libseven', libseven_dep)

meson.build

@@ -1,26 +1,29 @@
 project('sdk-seven', 'c',
- version: '0.19.4',
+ version: '0.19.5',
  license: 'Zlib',
  meson_version: '>=0.59.0',
  default_options: ['warning_level=2', 'c_std=c99'])
 
-add_project_arguments(
+libseven_version = '0.17.2'
+minrt_version = '0.7.3'
+
+cflags = [
  '-mthumb',
  '-ffunction-sections',
  '-fdata-sections',
- language: 'c')
+]
 
-add_project_link_arguments(
+ldflags = [
  '-mthumb',
  '-Wl,--gc-sections',
- '-Wl,-z,max-page-size=1',
- language: 'c')
+ '-Wl,-z,max-page-size=1'
+]
 
 # Generate debug info compatible with no$gba v3.05
 #
 # This does not work if libc or other system code is built with newer debug info
 if get_option('debug')
- add_project_arguments('-gdwarf-4', language: 'c')
+ cflags += '-gdwarf-4'
 endif
 
 cc = meson.get_compiler('c')
@@ -30,7 +33,7 @@ cc = meson.get_compiler('c')
 has_nano = cc.find_library('c_nano', required: false).found()
 
 if get_option('use_nano').require(has_nano).allowed()
- add_project_link_arguments('-specs=nano.specs', language: 'c')
+ ldflags += '-specs=nano.specs'
 endif
 
 # Remove warnings on newer toolchains
@@ -43,9 +46,12 @@ endif
 ld_h = run_command(cc, '-Wl,--help', capture: true, check: false)
 
 if ld_h.stdout().contains('--no-warn-rwx-segments')
- add_project_link_arguments('-Wl,--no-warn-rwx-segments', language: 'c')
+ ldflags += '-Wl,--no-warn-rwx-segments'
 endif
 
+add_project_arguments(cflags, language: 'c')
+add_project_link_arguments(ldflags, language: 'c')
+
 subdir('libseven')
 subdir('minrt')
 subdir('tools')

minrt/meson.build

@@ -1,5 +1,3 @@
-version = '0.7.3'
-
 sources_c = [
  'src/c/exit.c',
  'src/c/fini.c',
@@ -57,13 +55,13 @@ minrt_dep = declare_dependency(
  include_directories: includes,
  link_with: minrt,
  link_args: link_args + ['-Trom.mem', '-Tgba.x'],
- version: version)
+ version: minrt_version)
 
 minrt_mb_dep = declare_dependency(
  include_directories: includes,
  link_with: minrt_mb,
  link_args: link_args + ['-Tmultiboot.mem', '-Tgba.x'],
- version: version)
+ version: minrt_version)
 
 meson.override_dependency('minrt', minrt_dep)
 meson.override_dependency('minrt-multiboot', minrt_mb_dep)