diff options
| author |  IBNobody <ibnobody@gmail.com> | 2016-04-14 22:33:18 -0500 |
|---|---|---|
| committer | IBNobody <ibnobody@gmail.com> | 2016-04-14 22:33:18 -0500 |
| commit | 66c1024bd328b687fba0645f70469094e75d624c (patch) | |
| tree | c1d029247857cbbdff7c598129e8b5aa84500261 /tmk_core/protocol | |
| parent | 3993afbb2e022f4e6371c729ac6a025f16bc734e (diff) | |
| parent | d4f90fe882b33a99fd94e1befdf21323293e71ea (diff) | |
| download | qmk_firmware-66c1024bd328b687fba0645f70469094e75d624c.tar.gz | |
fixed merging
Diffstat (limited to 'tmk_core/protocol')
| -rw-r--r-- | tmk_core/protocol/lufa.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk index 4905760bb..f3209c227 100644 --- a/tmk_core/protocol/lufa.mk +++ b/tmk_core/protocol/lufa.mk @@ -17,7 +17,7 @@ LUFA_SRC = $(LUFA_DIR)/lufa.c \ $(LUFA_DIR)/descriptor.c \ $(LUFA_SRC_USB) -ifdef MIDI_ENABLE +ifeq ($(MIDI_ENABLE), yes) LUFA_SRC += $(LUFA_DIR)/midi/midi.c \ $(LUFA_DIR)/midi/midi_device.c \ $(LUFA_DIR)/midi/bytequeue/bytequeue.c \ @@ -25,7 +25,7 @@ ifdef MIDI_ENABLE $(LUFA_SRC_USBCLASS) endif -ifdef BLUETOOTH_ENABLE +ifeq ($(BLUETOOTH_ENABLE), yes) LUFA_SRC += $(LUFA_DIR)/bluetooth.c \ $(TMK_DIR)/protocol/serial_uart.c endif |