diff options
| author | QMK Bot <hello@qmk.fm> | 2021-02-07 23:16:47 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-02-07 23:16:47 +0000 |
| commit | 3a98bd75c88c5cc64aed72b9d2e3a8857d949fed (patch) | |
| tree | 7edcbbfa0c0efd16e456d6012f90833922d3bb3c /common_features.mk | |
| parent | b8031a1613290ada50f4cb746216fcae90d8935d (diff) | |
| parent | 99bffc2a21ebed07fd767ad2a9a7e1aadd491ef3 (diff) | |
| download | qmk_firmware-3a98bd75c88c5cc64aed72b9d2e3a8857d949fed.tar.gz qmk_firmware-3a98bd75c88c5cc64aed72b9d2e3a8857d949fed.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'common_features.mk')
| -rw-r--r-- | common_features.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/common_features.mk b/common_features.mk index 7c956cbf2..5d3a200dc 100644 --- a/common_features.mk +++ b/common_features.mk | |||
| @@ -17,6 +17,7 @@ SERIAL_PATH := $(QUANTUM_PATH)/serial_link | |||
| 17 | 17 | ||
| 18 | QUANTUM_SRC += \ | 18 | QUANTUM_SRC += \ |
| 19 | $(QUANTUM_DIR)/quantum.c \ | 19 | $(QUANTUM_DIR)/quantum.c \ |
| 20 | $(QUANTUM_DIR)/bitwise.c \ | ||
| 20 | $(QUANTUM_DIR)/led.c \ | 21 | $(QUANTUM_DIR)/led.c \ |
| 21 | $(QUANTUM_DIR)/keymap_common.c \ | 22 | $(QUANTUM_DIR)/keymap_common.c \ |
| 22 | $(QUANTUM_DIR)/keycode_config.c | 23 | $(QUANTUM_DIR)/keycode_config.c |
| @@ -36,6 +37,11 @@ ifeq ($(strip $(API_SYSEX_ENABLE)), yes) | |||
| 36 | SRC += $(QUANTUM_DIR)/api.c | 37 | SRC += $(QUANTUM_DIR)/api.c |
| 37 | endif | 38 | endif |
| 38 | 39 | ||
| 40 | ifeq ($(strip $(COMMAND_ENABLE)), yes) | ||
| 41 | SRC += $(QUANTUM_DIR)/command.c | ||
| 42 | OPT_DEFS += -DCOMMAND_ENABLE | ||
| 43 | endif | ||
| 44 | |||
| 39 | ifeq ($(strip $(AUDIO_ENABLE)), yes) | 45 | ifeq ($(strip $(AUDIO_ENABLE)), yes) |
| 40 | OPT_DEFS += -DAUDIO_ENABLE | 46 | OPT_DEFS += -DAUDIO_ENABLE |
| 41 | MUSIC_ENABLE = yes | 47 | MUSIC_ENABLE = yes |