Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot
2021-08-13 19:29:21 +00:00
10 changed files with 326 additions and 566 deletions

View File

@@ -1,10 +1,15 @@
SRC += jdelkins.c
ifeq ($(strip $(NO_SECRETS)), yes)
OPT_DEFS += -DNO_SECRETS
ifneq ($(strip $(NO_SECRETS)),)
OPT_DEFS += -DNO_SECRETS
endif
ifeq ($(shell test -f users/jdelkins/secrets.h.gpg && echo yes || echo no),yes)
users/jdelkins/jdelkins.c: users/jdelkins/secrets.h
touch $@
users/jdelkins/secrets.h: users/jdelkins/secrets.h.gpg
gpg -d $< >$@
endif
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite