diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-30 12:38:48 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-30 12:38:48 -0400 |
| commit | 44a5f7630f18b40b36270d49449a43cd42b802f0 (patch) | |
| tree | 9d29ee26496a458bf161eeb59dab5e12d85cb3aa /tmk_core/common.mk | |
| parent | c9f509f0168f6d11e743a9d2e37964c05e45672b (diff) | |
| parent | a8b55f8c858933a0f7641f7bf2dede640235aa70 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common.mk')
| -rw-r--r-- | tmk_core/common.mk | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index a1eb38c9c8..f2a22e4f8c 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -17,10 +17,11 @@ SRC += $(COMMON_DIR)/host.c \ # Option modules ifeq ($(strip $(BOOTMAGIC_ENABLE)), yes) + OPT_DEFS += -DBOOTMAGIC_ENABLE SRC += $(COMMON_DIR)/bootmagic.c SRC += $(COMMON_DIR)/avr/eeconfig.c - OPT_DEFS += -DBOOTMAGIC_ENABLE else + OPT_DEFS += -DMAGIC_ENABLE SRC += $(COMMON_DIR)/magic.c SRC += $(COMMON_DIR)/avr/eeconfig.c endif @@ -51,18 +52,6 @@ ifeq ($(strip $(NKRO_ENABLE)), yes) OPT_DEFS += -DNKRO_ENABLE endif -ifeq ($(strip $(MIDI_ENABLE)), yes) - OPT_DEFS += -DMIDI_ENABLE -endif - -ifeq ($(strip $(AUDIO_ENABLE)), yes) - OPT_DEFS += -DAUDIO_ENABLE -endif - -ifeq ($(strip $(UNICODE_ENABLE)), yes) - OPT_DEFS += -DUNICODE_ENABLE -endif - ifeq ($(strip $(USB_6KRO_ENABLE)), yes) OPT_DEFS += -DUSB_6KRO_ENABLE endif |