Skip to content

Commit 6239ac1

Browse files
author
Erich Styger
committed
Merge branch 'main' of github.com:ErichStyger/MetaClockClock
2 parents 8cf1b04 + 0801230 commit 6239ac1

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Firmware/McuLib

Firmware/tinyK22_Master_vs_code/ClockCommon

Lines changed: 0 additions & 1 deletion
This file was deleted.

Firmware/tinyK22_Master_vs_code/armgcc/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,10 @@ include_directories(
8686
${PROJECT_ROOT_DIR}/usb/device/class/cdc
8787
)
8888

89-
add_compile_options(-include "${PROJECT_ROOT_DIR}/IncludeMcuLibConfig.h" -DUSB_STACK_BM)
89+
add_compile_options(
90+
-include "${PROJECT_ROOT_DIR}/IncludeMcuLibConfig.h"
91+
-DUSB_STACK_BM
92+
)
9093

9194
add_subdirectory(${MCULIB_DIR} McuLib)
9295
add_subdirectory(${CLOCKCOMMON_DIR} ClockCommonLib)
@@ -106,7 +109,6 @@ add_executable(${MCUX_SDK_PROJECT_NAME}
106109
"${ProjDirPath}/../board/clock_config.h"
107110
"${ProjDirPath}/../board/clock_config.c"
108111
"${ProjDirPath}/../board/hardware_init.c"
109-
"${ProjDirPath}/../app.h"
110112
"${ProjDirPath}/../mcux_config.h"
111113
)
112114

0 commit comments

Comments
 (0)