diff options
| author | Ole Anders <git@swoy.org> | 2017-03-28 15:55:33 +0200 |
|---|---|---|
| committer | Ole Anders <git@swoy.org> | 2017-03-28 15:55:33 +0200 |
| commit | 62faa20ef6ddab7dacc74123b2253cf25b5c20f7 (patch) | |
| tree | 281ae30283f7491b2529465da4897dc2ddd7088c /tmk_core/common.mk | |
| parent | d5ee0194abf5cc9df4086a89ad78cf188352028a (diff) | |
| parent | 5e4daf1c6db980fad269fe7b013205008bfe701e (diff) | |
| download | qmk_firmware-62faa20ef6ddab7dacc74123b2253cf25b5c20f7.tar.gz qmk_firmware-62faa20ef6ddab7dacc74123b2253cf25b5c20f7.tar.xz | |
Merge remote-tracking branch 'refs/remotes/qmk/master'
Diffstat (limited to 'tmk_core/common.mk')
| -rw-r--r-- | tmk_core/common.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index a86dccc61..47f6fc571 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -93,14 +93,20 @@ ifeq ($(strip $(BACKLIGHT_ENABLE)), yes) TMK_COMMON_DEFS += -DBACKLIGHT_ENABLE endif -ifeq ($(strip $(ADAFRUIT_BLE_ENABLE)), yes) - TMK_COMMON_DEFS += -DADAFRUIT_BLE_ENABLE -endif - ifeq ($(strip $(BLUETOOTH_ENABLE)), yes) TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE endif +ifeq ($(strip $(BLUETOOTH)), AdafruitBLE) + TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE + TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_BLE +endif + +ifeq ($(strip $(BLUETOOTH)), AdafruitEZKey) + TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE + TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_EZKEY +endif + ifeq ($(strip $(ONEHAND_ENABLE)), yes) TMK_COMMON_DEFS += -DONEHAND_ENABLE endif |