mhu/reflow-oven-control-sw
2
0
Fork 0
Code Issues 4 Pull Requests Releases 4 Wiki Activity

Update linked list library and include it into build

Browse Source
This commit is contained in:
Mario Hüttel 2021-04-10 22:35:30 +02:00
parent 5437a323c3
commit 01b445a0fb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stm-firmware/CMakeLists.txt
View File

@ -74,7 +74,7 @@ if (UART_ON_DEBUG_HEADER)
endif (UART_ON_DEBUG_HEADER) endif (UART_ON_DEBUG_HEADER)
add_subdirectory(base64-lib) add_subdirectory(base64-lib)
add_subdirectory(linklist-lib)
aux_source_directory("." MAIN_SOURCES) aux_source_directory("." MAIN_SOURCES)
aux_source_directory("config-parser" CFG_PARSER_SRCS) aux_source_directory("config-parser" CFG_PARSER_SRCS)
@ -98,7 +98,7 @@ add_dependencies(${ELFFILE} updater-ram-code-header-blob)
target_include_directories(${ELFFILE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/shellmatta/api ${CMAKE_CURRENT_SOURCE_DIR}/config-parser/include) target_include_directories(${ELFFILE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/shellmatta/api ${CMAKE_CURRENT_SOURCE_DIR}/config-parser/include)
target_link_options(${ELFFILE} PRIVATE -mlittle-endian -mthumb -mcpu=cortex-m4 -mthumb-interwork -mfloat-abi=hard -mfpu=fpv4-sp-d16 --disable-newlib-supplied-syscalls -nostartfiles -T${LINKER_SCRIPT} -Wl,--print-memory-usage) target_link_options(${ELFFILE} PRIVATE -mlittle-endian -mthumb -mcpu=cortex-m4 -mthumb-interwork -mfloat-abi=hard -mfpu=fpv4-sp-d16 --disable-newlib-supplied-syscalls -nostartfiles -T${LINKER_SCRIPT} -Wl,--print-memory-usage)
target_link_libraries(${ELFFILE} base64-lib) target_link_libraries(${ELFFILE} base64-lib linklist-lib)
target_include_directories(${ELFFILE} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/updater/ram-code/include/") target_include_directories(${ELFFILE} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/updater/ram-code/include/")
set(HEX_PATH "${CMAKE_CURRENT_BINARY_DIR}/${HEXFILE}") set(HEX_PATH "${CMAKE_CURRENT_BINARY_DIR}/${HEXFILE}")

2
stm-firmware/linklist-lib

@ -1 +1 @@
Subproject commit 77a6a862348f9dfb4b28576857fb3cda0705ec40 Subproject commit 18b3ab377ac30516f977e9831813ea37189d4028