X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=common.mk;h=5b70db9499b314aedb8286278bea222ef876772c;hb=05792e2b83ea99009d895a4caad0e40b5395aff3;hp=9523ae8749e341874aab67d4f3d65a8ca09c6932;hpb=259c4a040af658552d7a003655572c33d8fcef83;p=max%2Ftmk_keyboard.git diff --git a/common.mk b/common.mk index 9523ae87..5b70db94 100644 --- a/common.mk +++ b/common.mk @@ -3,9 +3,9 @@ SRC += $(COMMON_DIR)/host.c \ $(COMMON_DIR)/keyboard.c \ $(COMMON_DIR)/action.c \ $(COMMON_DIR)/action_tapping.c \ - $(COMMON_DIR)/action_oneshot.c \ $(COMMON_DIR)/action_macro.c \ $(COMMON_DIR)/action_layer.c \ + $(COMMON_DIR)/action_util.c \ $(COMMON_DIR)/keymap.c \ $(COMMON_DIR)/timer.c \ $(COMMON_DIR)/print.c \ @@ -69,12 +69,12 @@ ifdef BACKLIGHT_ENABLE endif ifdef KEYMAP_SECTION_ENABLE - OPT_DEFS += -DKEYMAP_SECTION + OPT_DEFS += -DKEYMAP_SECTION_ENABLE EXTRALDFLAGS = -Wl,-L$(TOP_DIR),-Tldscript_keymap_avr5.x endif # Version string -OPT_DEFS += -DVERSION=$(shell (git describe --dirty || echo 'unknown') 2> /dev/null) +OPT_DEFS += -DVERSION=$(shell (git describe --always --dirty || echo 'unknown') 2> /dev/null) # Search Path