make libseven and minrt agree on CFLAGS

LunarLambda · Nov 1, 2022 · 40e9fcf · 40e9fcf
1 parent 9b63a3a
commit 40e9fcf
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/meson.build b/meson.build
@@ -1,5 +1,5 @@
 project('sdk-seven', 'c',
-  version: '0.1.0',
+  version: '0.1.1',
   license: 'Zlib',
   meson_version: '>=0.56.0')
 
@@ -17,7 +17,10 @@ add_project_link_arguments(
 subproject('libseven')
 subproject('minrt')
 
+subdir('tools')
+
 mapfile = '-Wl,-Map,@0@.map'
 
-subdir('tools')
-subdir('examples')
+if not meson.is_subproject()
+  subdir('examples')
+endif
diff --git a/subprojects/libseven/meson.build b/subprojects/libseven/meson.build
@@ -1,7 +1,7 @@
 project('libseven', 'c',
-  version: '0.7.0',
+  version: '0.7.1',
   license: 'MPL-2.0',
-  default_options: ['c_std=c99'])
+  default_options: ['warning_level=2', 'c_std=c99'])
 
 sources = [
   'src/hw/dma.s',
@@ -21,14 +21,16 @@ sources = [
   'src/video/oam.s',
 ]
 
+includes = ['include']
+
 libseven = static_library(
   'seven',
   sources,
-  include_directories: ['include', 'src'],
-  c_args: ['-ffunction-sections', '-fdata-sections', '-ffreestanding'])
+  include_directories: includes + 'src',
+  c_args: ['-mthumb', '-ffunction-sections', '-fdata-sections', '-ffreestanding'])
 
 libseven_dep = declare_dependency(
-  include_directories: ['include'],
+  include_directories: includes,
   link_with: libseven)
 
 meson.override_dependency('libseven', libseven_dep)
diff --git a/subprojects/minrt/meson.build b/subprojects/minrt/meson.build
@@ -1,13 +1,14 @@
 project('minrt', 'c',
-  version: '0.1.0',
-  license: 'MPL-2.0')
+  version: '0.1.1',
+  license: 'MPL-2.0',
+  default_options: ['warning_level=2', 'c_std=c99'])
 
 sources = [
   'src/crt0.s',
   'src/ram.c',
 ]
 
-include = ['include']
+includes = ['include']
 
 lib = meson.project_source_root() / 'lib'
 
@@ -16,15 +17,16 @@ link_args = ['-specs=' + lib / 'nocrt0.specs', '-L' + lib]
 minrt = static_library(
   'minrt',
   sources,
-  include_directories: include + 'src')
+  include_directories: includes + 'src',
+  c_args: ['-mthumb', '-ffunction-sections', '-fdata-sections', '-ffreestanding'])
 
 minrt_dep = declare_dependency(
-  include_directories: include,
+  include_directories: includes,
   link_with: minrt,
   link_args: link_args + '-Trom.ld')
 
 minrt_mb_dep = declare_dependency(
-  include_directories: include,
+  include_directories: includes,
   link_with: minrt,
   link_args: link_args + '-Tmultiboot.ld')