diff options
| author | hathach <[email protected]> | 2025-07-08 10:09:24 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2025-07-08 10:09:24 +0700 |
| commit | a56f55c10bea2ce0d38de6a04edae41e6c814b9f (patch) | |
| tree | e9a1791ce6ba17a2ac9a411f5c897f0911d28ff1 /examples/build_system/make/make.mk | |
| parent | 545690c83435fc9e972a65a4e46539c88f2a2853 (diff) | |
| parent | ea64300a9ad57fbdcafbed189b3d358bf9b6912e (diff) | |
Merge remote-tracking branch 'origin/master' into xfer_isr
# Conflicts:
# examples/device/audio_4_channel_mic_freertos/src/main.c
# examples/device/audio_test_freertos/src/main.c
# src/class/audio/audio_device.c
Diffstat (limited to 'examples/build_system/make/make.mk')
| -rw-r--r-- | examples/build_system/make/make.mk | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/examples/build_system/make/make.mk b/examples/build_system/make/make.mk index dbc73903e..f70748d34 100644 --- a/examples/build_system/make/make.mk +++ b/examples/build_system/make/make.mk @@ -123,27 +123,24 @@ endif ifeq (${MAX3421_HOST},1) SRC_C += src/portable/analog/max3421/hcd_max3421.c CFLAGS += -DCFG_TUH_MAX3421=1 - CMAKE_DEFSYM += -DMAX3421_HOST=1 endif # Log level is mapped to TUSB DEBUG option ifneq ($(LOG),) - CMAKE_DEFSYM += -DLOG=$(LOG) CFLAGS += -DCFG_TUSB_DEBUG=$(LOG) endif # Logger: default is uart, can be set to rtt or swo -ifneq ($(LOGGER),) - CMAKE_DEFSYM += -DLOGGER=$(LOGGER) -endif - ifeq ($(LOGGER),rtt) - CFLAGS += -DLOGGER_RTT -DSEGGER_RTT_MODE_DEFAULT=SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL - RTT_SRC = lib/SEGGER_RTT - INC += $(TOP)/$(RTT_SRC)/RTT - SRC_C += $(RTT_SRC)/RTT/SEGGER_RTT.c -else ifeq ($(LOGGER),swo) + CFLAGS += -DLOGGER_RTT + #CFLAGS += -DSEGGER_RTT_MODE_DEFAULT=SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL + INC += $(TOP)/$(lib/SEGGER_RTT)/RTT + SRC_C += $(lib/SEGGER_RTT)/RTT/SEGGER_RTT.c +endif +ifeq ($(LOGGER),swo) CFLAGS += -DLOGGER_SWO +else + CFLAGS += -DLOGGER_UART endif # CPU specific flags |