diff options
| author | skullY <skullydazed@gmail.com> | 2020-05-04 09:25:44 -0700 |
|---|---|---|
| committer | skullY <skullydazed@gmail.com> | 2020-05-04 09:25:44 -0700 |
| commit | 6f30b402a285ddecce9b6f5b002a649f775225d2 (patch) | |
| tree | 5a25c7334d931a56d9fbfad80b6284cda7e38950 /tmk_core/common.mk | |
| parent | 1ff526dac0e73ea8cce522d0106631e3a748802c (diff) | |
| download | firmware-6f30b402a285ddecce9b6f5b002a649f775225d2.tar.gz firmware-6f30b402a285ddecce9b6f5b002a649f775225d2.tar.bz2 firmware-6f30b402a285ddecce9b6f5b002a649f775225d2.zip | |
Revert "Fix conflicting types for 'tfp_printf' (#8269)"
This reverts commit e17b55e33ad5b3dcefcf7b828ac99aeb2daeeae2.
Diffstat (limited to 'tmk_core/common.mk')
| -rw-r--r-- | tmk_core/common.mk | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 63de7c7ed..aa8a0eb7a 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -1,5 +1,3 @@ -PRINTF_PATH = $(LIB_PATH)/printf - COMMON_DIR = common PLATFORM_COMMON_DIR = $(COMMON_DIR)/$(PLATFORM_KEY) @@ -23,12 +21,7 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ ifeq ($(PLATFORM),AVR) TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S else ifeq ($(PLATFORM),CHIBIOS) - TMK_COMMON_SRC += $(PRINTF_PATH)/printf.c - TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_FLOAT - TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_EXPONENTIAL - TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_LONG_LONG - TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_PTRDIFF_T - VPATH += $(PRINTF_PATH) + TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c else ifeq ($(PLATFORM),ARM_ATSAM) TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c endif |