diff options
| author | Xyverz <xyverz@gmail.com> | 2017-04-02 14:49:39 -0700 |
|---|---|---|
| committer | Xyverz <xyverz@gmail.com> | 2017-04-02 14:49:39 -0700 |
| commit | c034b61b1abb2bf23187abae562bf53916c60fa1 (patch) | |
| tree | d36aa00c7ae93ce144445638b61269d3a0dd5f50 /tmk_core/common.mk | |
| parent | 787304647961f4cb654188ddb88c22dd7991ab87 (diff) | |
| parent | 3448d5d4874a2775f85320a2be69edd241575d46 (diff) | |
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 |