diff options
Diffstat (limited to 'builddefs')
| -rw-r--r-- | builddefs/build_full_test.mk | 2 | ||||
| -rw-r--r-- | builddefs/build_test.mk | 1 | ||||
| -rw-r--r-- | builddefs/common_features.mk | 8 | ||||
| -rw-r--r-- | builddefs/message.mk | 7 | ||||
| -rw-r--r-- | builddefs/testlist.mk | 1 |
5 files changed, 16 insertions, 3 deletions
diff --git a/builddefs/build_full_test.mk b/builddefs/build_full_test.mk index 35f0a05b99..964ba773d4 100644 --- a/builddefs/build_full_test.mk +++ b/builddefs/build_full_test.mk @@ -24,6 +24,8 @@ $(TEST)_SRC := \ tests/test_common/matrix.c \ tests/test_common/test_driver.cpp \ tests/test_common/keyboard_report_util.cpp \ + tests/test_common/keycode_util.cpp \ + tests/test_common/keycode_table.cpp \ tests/test_common/test_fixture.cpp \ tests/test_common/test_keymap_key.cpp \ tests/test_common/test_logger.cpp \ diff --git a/builddefs/build_test.mk b/builddefs/build_test.mk index 7c8fdd20e5..4230598373 100644 --- a/builddefs/build_test.mk +++ b/builddefs/build_test.mk @@ -62,6 +62,7 @@ include $(PLATFORM_PATH)/common.mk include $(TMK_PATH)/protocol.mk include $(QUANTUM_PATH)/debounce/tests/rules.mk include $(QUANTUM_PATH)/encoder/tests/rules.mk +include $(QUANTUM_PATH)/os_detection/tests/rules.mk include $(QUANTUM_PATH)/sequencer/tests/rules.mk include $(QUANTUM_PATH)/wear_leveling/tests/rules.mk include $(QUANTUM_PATH)/logging/print.mk diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index d9130b5338..dbcfcb7145 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -907,3 +907,11 @@ ifeq ($(strip $(ENCODER_ENABLE)), yes) OPT_DEFS += -DENCODER_MAP_ENABLE endif endif + +ifeq ($(strip $(OS_DETECTION_ENABLE)), yes) + SRC += $(QUANTUM_DIR)/os_detection.c + OPT_DEFS += -DOS_DETECTION_ENABLE + ifeq ($(strip $(OS_DETECTION_DEBUG_ENABLE)), yes) + OPT_DEFS += -DOS_DETECTION_DEBUG_ENABLE + endif +endif diff --git a/builddefs/message.mk b/builddefs/message.mk index 07d0e07ce8..bf39554dab 100644 --- a/builddefs/message.mk +++ b/builddefs/message.mk @@ -64,9 +64,10 @@ MSG_ASSEMBLING = Assembling: MSG_CLEANING = Cleaning project: MSG_CREATING_LIBRARY = Creating library: MSG_GENERATING = Generating: +MSG_NOT_REPO = $(WARN_COLOR)WARNING:$(NO_COLOR) Target folder is not a git repo, you probably downloaded a zip file instead of cloning.\n\ +Please consider following $(BOLD)https://docs.qmk.fm/\#/newbs_getting_started$(NO_COLOR).\n\n MSG_SUBMODULE_DIRTY = $(WARN_COLOR)WARNING:$(NO_COLOR) Some git submodules are out of date or modified.\n\ -Please consider running $(BOLD)make git-submodule$(NO_COLOR).\n\n -MSG_NO_CMP = $(ERROR_COLOR)Error:$(NO_COLOR)$(BOLD) cmp command not found, please install diffutils\n$(NO_COLOR) +Please consider running $(BOLD)qmk git-submodule$(NO_COLOR).\n\n define GENERATE_MSG_MAKE_KB MSG_MAKE_KB_ACTUAL := Making $$(KB_SP) with keymap $(BOLD)$$(CURRENT_KM)$(NO_COLOR) @@ -106,4 +107,4 @@ MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY = $(MSG_BOOTLOADER_NOT_FOUND_BASE) Trying a define CATASTROPHIC_ERROR $(shell printf "\n * %-99s $(ERROR_STRING)\n" "$2" >&2) $(error $1) -endef
\ No newline at end of file +endef diff --git a/builddefs/testlist.mk b/builddefs/testlist.mk index 8a30a44972..74a794adcd 100644 --- a/builddefs/testlist.mk +++ b/builddefs/testlist.mk @@ -3,6 +3,7 @@ FULL_TESTS := $(notdir $(TEST_LIST)) include $(QUANTUM_PATH)/debounce/tests/testlist.mk include $(QUANTUM_PATH)/encoder/tests/testlist.mk +include $(QUANTUM_PATH)/os_detection/tests/testlist.mk include $(QUANTUM_PATH)/sequencer/tests/testlist.mk include $(QUANTUM_PATH)/wear_leveling/tests/testlist.mk include $(PLATFORM_PATH)/test/testlist.mk |