From 30adfe268db8cd8a099b1054ede3846508c76815 Mon Sep 17 00:00:00 2001 From: erlingrj Date: Mon, 13 May 2024 15:32:55 +0200 Subject: [PATCH 1/2] Update reactor-c --- core/src/main/resources/lib/c/reactor-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c index 1bd513091c..2318dad981 160000 --- a/core/src/main/resources/lib/c/reactor-c +++ b/core/src/main/resources/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 1bd513091c57e65f7e4d3eae972b65c01f529e28 +Subproject commit 2318dad981916ce3ebfb21b52c1c79635a1a6ff4 From d054ad29961fd6d1962c94b8f14f45852726e60a Mon Sep 17 00:00:00 2001 From: erlingrj Date: Mon, 13 May 2024 16:50:35 +0200 Subject: [PATCH 2/2] Generated pico CMake links with reactor-c, not core --- .../main/java/org/lflang/generator/c/CCmakeGenerator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java index 9b984f5fc9..025fa8e603 100644 --- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java +++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java @@ -493,9 +493,9 @@ private static String setUpMainTargetRp2040( code.pr("pico_sdk_init()"); code.newLine(); code.pr("add_subdirectory(core)"); - code.pr("target_link_libraries(core PUBLIC pico_stdlib)"); - code.pr("target_link_libraries(core PUBLIC pico_multicore)"); - code.pr("target_link_libraries(core PUBLIC pico_sync)"); + code.pr("target_link_libraries(reactor-c PUBLIC pico_stdlib)"); + code.pr("target_link_libraries(reactor-c PUBLIC pico_multicore)"); + code.pr("target_link_libraries(reactor-c PUBLIC pico_sync)"); code.newLine(); code.pr("set(LF_MAIN_TARGET " + executableName + ")");