diff options
| author | Oxore <oxore@protonmail.com> | 2023-03-05 18:28:08 +0300 |
|---|---|---|
| committer | Oxore <oxore@protonmail.com> | 2023-03-05 20:04:58 +0300 |
| commit | dd01e7ed22cea652061f0d12cecf929e04b285e9 (patch) | |
| tree | 4ccbb9e22cfcfebd2703bbd2b104fc8207df6a93 | |
| parent | 5047decf97ca5439a4176febabe4da0c39d8fb6c (diff) | |
Restructure toolchain file
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | toolchain-gcc-newlib.cmake (renamed from toolchain-gcc-newlib-arm-none-eabi-cm0.cmake) | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -7,4 +7,4 @@ /Project/EWARM/*.ewt /Project/EWARM/*.eww compile_commands.json -cmake[-_]build/ +cmake[-_]build*/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 40efc3b..35881c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer") set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer") +set(cpu_options -mthumb -mcpu=cortex-m0 -msoft-float) set(nixie_clock_sources "Libraries/Indicate/indicate_modes_task.c" "Libraries/TouchSense/stmCriticalSection.c" @@ -105,6 +106,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE target_compile_definitions(${PROJECT_NAME} PRIVATE STM32F0XX=1 LED_DRIVER=1 + __FREERTOS__=1 ) # select linker script diff --git a/toolchain-gcc-newlib-arm-none-eabi-cm0.cmake b/toolchain-gcc-newlib.cmake index 36b0405..0599b34 100644 --- a/toolchain-gcc-newlib-arm-none-eabi-cm0.cmake +++ b/toolchain-gcc-newlib.cmake @@ -11,5 +11,3 @@ set(CMAKE_LINKER "arm-none-eabi-gcc") set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_LINKER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_OBJCOPY "arm-none-eabi-objcopy") set(CMAKE_OBJSIZE "arm-none-eabi-size") -set(cpu_options -mthumb -mcpu=cortex-m0 -msoft-float) -add_compile_definitions("__FREERTOS__") |