diff options
author | Loek Le Blansch <loek@pipeframe.xyz> | 2024-06-18 17:34:20 +0200 |
---|---|---|
committer | Loek Le Blansch <loek@pipeframe.xyz> | 2024-06-18 17:34:20 +0200 |
commit | 35129b2ba8e416f99f4095d93ae748762b0e36fb (patch) | |
tree | a73bfc17eec64713238a3cab980e5e5973051984 | |
parent | 3f3bef9c6bf0b9143da80e4b4363eb0362fb91c9 (diff) |
main controller firmware compiling again
-rw-r--r-- | lib/pbdrv/CMakeLists.txt | 4 | ||||
-rw-r--r-- | main/CMakeLists.txt | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/pbdrv/CMakeLists.txt b/lib/pbdrv/CMakeLists.txt index a973406..91932b8 100644 --- a/lib/pbdrv/CMakeLists.txt +++ b/lib/pbdrv/CMakeLists.txt @@ -25,6 +25,10 @@ add_library(pbdrv OBJECT target_include_directories(pbdrv SYSTEM INTERFACE .) target_link_libraries(pbdrv mpack) +# TODO: pbdrv-mod should ideally only include sources specific to it, and link +# 'plain' pbdrv to provide the other functions. this seems to cause linker +# errors and I don't know why + # puzzle bus *module* specific code add_library(pbdrv-mod OBJECT pb-msg.c diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index e71f419..d6cbf33 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -10,6 +10,7 @@ include(lib/FreeRTOS-Kernel/portable/ThirdParty/GCC/RP2040/FreeRTOS_Kernel_impor add_subdirectory(lib/mpack) add_subdirectory(lib/i2ctcp) add_subdirectory(lib/pbdrv) +include(lib/pbdrv/ext/stdlib/include.cmake) # pico-stdlib is compatible with C stdlib project(puzzlebox_main C CXX ASM) |