diff options
author | Damien <Dbroqua@users.noreply.github.com> | 2017-04-02 23:29:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-02 23:29:12 +0200 |
commit | 3e41cde9f99778ca30c03b97470c32780379db43 (patch) | |
tree | 18e2376acae06563166b5ea8b8cd6368cb9cddae /tmk_core/common.mk | |
parent | e7347ff0de93ff823462b3ff2b4136b44dc576c0 (diff) | |
parent | 3448d5d4874a2775f85320a2be69edd241575d46 (diff) |
Merge pull request #19 from qmk/master
Merge from qmk
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 |