Skip to content
Snippets Groups Projects
Verified Commit 815e5e37 authored by rahix's avatar rahix
Browse files

fix(build): Actually fix meson scripts


Signed-off-by: default avatarRahix <rahix@rahix.de>
parent 6bd36b95
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,7 @@ executable( ...@@ -4,7 +4,7 @@ executable(
name + '.elf', name + '.elf',
'main.c', 'main.c',
dependencies: [libcard10, max32665_startup], dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib, link_whole: [max32665_startup_lib, board_card10_lib],
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -4,7 +4,7 @@ executable( ...@@ -4,7 +4,7 @@ executable(
name + '.elf', name + '.elf',
'main.c', 'main.c',
dependencies: [libcard10, max32665_startup], dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib, link_whole: [max32665_startup_lib, board_card10_lib],
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -3,7 +3,7 @@ executable( ...@@ -3,7 +3,7 @@ executable(
name + '.elf', name + '.elf',
'main.c', 'main.c',
dependencies: [libcard10, max32665_startup_core0], dependencies: [libcard10, max32665_startup_core0],
link_whole: max32665_startup_core0_lib, link_whole: [max32665_startup_core0_lib, board_card10_lib],
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
...@@ -14,7 +14,7 @@ executable( ...@@ -14,7 +14,7 @@ executable(
name + '.elf', name + '.elf',
'core1.c', 'core1.c',
dependencies: [periphdriver, board_card10, max32665_startup_core1], dependencies: [periphdriver, board_card10, max32665_startup_core1],
link_whole: max32665_startup_core1_lib, link_whole: [max32665_startup_core1_lib, board_card10_lib],
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -4,7 +4,7 @@ executable( ...@@ -4,7 +4,7 @@ executable(
name + '.elf', name + '.elf',
'main.c', 'main.c',
dependencies: [libcard10, max32665_startup], dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib, link_whole: [max32665_startup_lib, board_card10_lib],
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -22,7 +22,7 @@ executable( ...@@ -22,7 +22,7 @@ executable(
include_directories: freertos_sdk_includes, include_directories: freertos_sdk_includes,
dependencies: [libcard10, max32665_startup], dependencies: [libcard10, max32665_startup],
link_with: freertos, link_with: freertos,
link_whole: max32665_startup_lib, link_whole: [max32665_startup_lib, board_card10_lib],
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -4,7 +4,7 @@ executable( ...@@ -4,7 +4,7 @@ executable(
name + '.elf', name + '.elf',
'main.c', 'main.c',
dependencies: [libcard10, max32665_startup], dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib, link_whole: [max32665_startup_lib, board_card10_lib],
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -4,7 +4,7 @@ executable( ...@@ -4,7 +4,7 @@ executable(
name + '.elf', name + '.elf',
'main.c', 'main.c',
dependencies: [libcard10, max32665_startup], dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib, link_whole: [max32665_startup_lib, board_card10_lib],
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -6,7 +6,7 @@ executable( ...@@ -6,7 +6,7 @@ executable(
'image/image.c', 'image/image.c',
'image/image2.c', 'image/image2.c',
dependencies: [libcard10, max32665_startup], dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib, link_whole: [max32665_startup_lib, board_card10_lib],
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -11,7 +11,7 @@ sources = files( ...@@ -11,7 +11,7 @@ sources = files(
'../Source/stdio.c', '../Source/stdio.c',
) )
lib = static_library( board_card10_lib = static_library(
'board-card10', 'board-card10',
sources, sources,
include_directories: includes, include_directories: includes,
...@@ -20,5 +20,4 @@ lib = static_library( ...@@ -20,5 +20,4 @@ lib = static_library(
board_card10 = declare_dependency( board_card10 = declare_dependency(
include_directories: includes, include_directories: includes,
link_whole: lib,
) )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment