diff options
author | Joel Challis <git@zvecr.com> | 2020-05-04 07:19:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-03 23:19:51 -0700 |
commit | e17b55e33ad5b3dcefcf7b828ac99aeb2daeeae2 (patch) | |
tree | e6430a88e4ce4e73783f2a2f4fd4939885b1e402 /tmk_core/common.mk | |
parent | f31bf1b2025ece2d61cec10293cbd4e18b537eeb (diff) | |
download | qmk_firmware-e17b55e33ad5b3dcefcf7b828ac99aeb2daeeae2.tar.gz qmk_firmware-e17b55e33ad5b3dcefcf7b828ac99aeb2daeeae2.zip |
Fix conflicting types for 'tfp_printf' (#8269)
* Refactor to use mpaland/printf
* trim firmware size
* remove keymap changes
* run clang format
* Fixup after rebase
* fix up git-submodule command for printf
Diffstat (limited to 'tmk_core/common.mk')
-rw-r--r-- | tmk_core/common.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index aa8a0eb7a..63de7c7ed 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk | |||
@@ -1,3 +1,5 @@ | |||
1 | PRINTF_PATH = $(LIB_PATH)/printf | ||
2 | |||
1 | COMMON_DIR = common | 3 | COMMON_DIR = common |
2 | PLATFORM_COMMON_DIR = $(COMMON_DIR)/$(PLATFORM_KEY) | 4 | PLATFORM_COMMON_DIR = $(COMMON_DIR)/$(PLATFORM_KEY) |
3 | 5 | ||
@@ -21,7 +23,12 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ | |||
21 | ifeq ($(PLATFORM),AVR) | 23 | ifeq ($(PLATFORM),AVR) |
22 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S | 24 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S |
23 | else ifeq ($(PLATFORM),CHIBIOS) | 25 | else ifeq ($(PLATFORM),CHIBIOS) |
24 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c | 26 | TMK_COMMON_SRC += $(PRINTF_PATH)/printf.c |
27 | TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_FLOAT | ||
28 | TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_EXPONENTIAL | ||
29 | TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_LONG_LONG | ||
30 | TMK_COMMON_DEFS += -DPRINTF_DISABLE_SUPPORT_PTRDIFF_T | ||
31 | VPATH += $(PRINTF_PATH) | ||
25 | else ifeq ($(PLATFORM),ARM_ATSAM) | 32 | else ifeq ($(PLATFORM),ARM_ATSAM) |
26 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c | 33 | TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c |
27 | endif | 34 | endif |