diff options
author | Stick <[email protected]> | 2017-04-03 16:59:27 -0500 |
---|---|---|
committer | Stick <[email protected]> | 2017-04-03 16:59:27 -0500 |
commit | bee9183e7fae7c739b9c42dd4dc759783ac80e46 (patch) | |
tree | 690f17486c2e57175bbd36152d685ebedc7c9439 /tmk_core/common.mk | |
parent | b6280d0cac59c741db62a63072efd5de4887fc01 (diff) | |
parent | 3ac9259742bfd428f71c31dbf2bfedace2a7f91b (diff) | |
download | qmk_firmware-bee9183e7fae7c739b9c42dd4dc759783ac80e46.tar.gz qmk_firmware-bee9183e7fae7c739b9c42dd4dc759783ac80e46.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/common.mk')
-rw-r--r-- | tmk_core/common.mk | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index a86dccc616..3e0bd7dbc8 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -93,14 +93,25 @@ 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 $(BLUETOOTH)), RN42) + TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE + TMK_COMMON_DEFS += -DMODULE_RN42 +endif + ifeq ($(strip $(ONEHAND_ENABLE)), yes) TMK_COMMON_DEFS += -DONEHAND_ENABLE endif |