diff options
| author | xyverz <xyverz@gmail.com> | 2016-12-06 17:36:19 -0800 |
|---|---|---|
| committer | xyverz <xyverz@gmail.com> | 2016-12-06 17:36:19 -0800 |
| commit | 9216bc73778ef0fe5830b91511f37dd90fb0f0a1 (patch) | |
| tree | 6c9f343c2485150c1912b7b68ade364a232015bd /tmk_core/common.mk | |
| parent | f9cf4f75aec8cb24f054f243b985d9e5c18a2a80 (diff) | |
| parent | 985a091a739c99736d5b17de5161831488dbc219 (diff) | |
| download | firmware-9216bc73778ef0fe5830b91511f37dd90fb0f0a1.tar.gz firmware-9216bc73778ef0fe5830b91511f37dd90fb0f0a1.tar.bz2 firmware-9216bc73778ef0fe5830b91511f37dd90fb0f0a1.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/common.mk')
| -rw-r--r-- | tmk_core/common.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index f826a7b54..3c1373c08 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -50,6 +50,10 @@ ifeq ($(strip $(EXTRAKEY_ENABLE)), yes) TMK_COMMON_DEFS += -DEXTRAKEY_ENABLE endif +ifeq ($(strip $(RAW_ENABLE)), yes) + TMK_COMMON_DEFS += -DRAW_ENABLE +endif + ifeq ($(strip $(CONSOLE_ENABLE)), yes) TMK_COMMON_DEFS += -DCONSOLE_ENABLE else @@ -81,6 +85,10 @@ 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 @@ -110,4 +118,4 @@ endif VPATH += $(TMK_PATH)/$(COMMON_DIR) ifeq ($(PLATFORM),CHIBIOS) VPATH += $(TMK_PATH)/$(COMMON_DIR)/chibios -endif
\ No newline at end of file +endif |