Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Arist
firmware
Commits
6bd36b95
Verified
Commit
6bd36b95
authored
Jun 10, 2019
by
Rahix
Browse files
fix(build): Make meson <0.46.0 work
Signed-off-by:
Rahix
<
rahix@rahix.de
>
parent
fa3d5c34
Changes
9
Hide whitespace changes
Inline
Side-by-side
hw-tests/bmatest/meson.build
View file @
6bd36b95
...
...
@@ -4,6 +4,7 @@ executable(
name + '.elf',
'main.c',
dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib,
link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
],
...
...
hw-tests/bmetest/meson.build
View file @
6bd36b95
...
...
@@ -4,6 +4,7 @@ executable(
name + '.elf',
'main.c',
dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib,
link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
],
...
...
hw-tests/dual-core/meson.build
View file @
6bd36b95
...
...
@@ -3,6 +3,7 @@ executable(
name + '.elf',
'main.c',
dependencies: [libcard10, max32665_startup_core0],
link_whole: max32665_startup_core0_lib,
link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
],
...
...
@@ -13,6 +14,7 @@ executable(
name + '.elf',
'core1.c',
dependencies: [periphdriver, board_card10, max32665_startup_core1],
link_whole: max32665_startup_core1_lib,
link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
],
...
...
hw-tests/ecgtest/meson.build
View file @
6bd36b95
...
...
@@ -4,6 +4,7 @@ executable(
name + '.elf',
'main.c',
dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib,
link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
],
...
...
hw-tests/hello-freertos/meson.build
View file @
6bd36b95
...
...
@@ -22,6 +22,7 @@ executable(
include_directories: freertos_sdk_includes,
dependencies: [libcard10, max32665_startup],
link_with: freertos,
link_whole: max32665_startup_lib,
link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
],
...
...
hw-tests/hello-world/meson.build
View file @
6bd36b95
...
...
@@ -4,6 +4,7 @@ executable(
name + '.elf',
'main.c',
dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib,
link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
],
...
...
hw-tests/imutest/meson.build
View file @
6bd36b95
...
...
@@ -4,6 +4,7 @@ executable(
name + '.elf',
'main.c',
dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib,
link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
],
...
...
hw-tests/ips/meson.build
View file @
6bd36b95
...
...
@@ -6,6 +6,7 @@ executable(
'image/image.c',
'image/image2.c',
dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib,
link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
],
...
...
lib/sdk/Libraries/CMSIS/Device/Maxim/MAX32665/meson.build
View file @
6bd36b95
...
...
@@ -8,14 +8,13 @@ sources = files(
'./Source/heap.c',
)
lib = static_library(
max32665_startup_
lib = static_library(
'max32665-startup',
sources,
dependencies: periphdriver,
)
max32665_startup = declare_dependency(
link_whole: lib,
link_args: [
'-T', meson.current_source_dir() + 'Source/GCC/max32665.ld',
'--entry', 'Reset_Handler',
...
...
@@ -32,14 +31,13 @@ sources = files(
'./Source/heap.c',
)
lib = static_library(
max32665_startup_core0_
lib = static_library(
'max32665-startup-core0',
sources,
dependencies: periphdriver,
)
max32665_startup_core0 = declare_dependency(
link_whole: lib,
link_args: [
'-T', meson.current_source_dir() + 'Source/GCC/max32665_core0.ld',
'--entry', 'Reset_Handler',
...
...
@@ -56,14 +54,13 @@ sources = files(
'./Source/heap.c',
)
lib = static_library(
max32665_startup_core1_
lib = static_library(
'max32665-startup-core1',
sources,
dependencies: periphdriver,
)
max32665_startup_core1 = declare_dependency(
link_whole: lib,
link_args: [
'-T', meson.current_source_dir() + 'Source/GCC/max32665_core1.ld',
'--entry', 'Reset_Handler',
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment