diff options
| author | Hugh Enxing <henxing@draper.com> | 2017-03-28 12:11:49 -0400 |
|---|---|---|
| committer | Hugh Enxing <henxing@draper.com> | 2017-03-28 12:11:49 -0400 |
| commit | 3fdc45b4e9581c823ac09545241241e0c6d3f313 (patch) | |
| tree | f17c050672086233a2de4e4c8d0ba72c5bd87841 /tmk_core/common.mk | |
| parent | 25f2295ba88627521bed63ec4e5412b983626901 (diff) | |
| parent | 5e4daf1c6db980fad269fe7b013205008bfe701e (diff) | |
| download | firmware-3fdc45b4e9581c823ac09545241241e0c6d3f313.tar.gz firmware-3fdc45b4e9581c823ac09545241241e0c6d3f313.tar.bz2 firmware-3fdc45b4e9581c823ac09545241241e0c6d3f313.zip | |
Merge branch 'master' into default_atreus_layout
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 |