localhots/qmk_firmware
1
0
Fork 0
Code Releases Activity

Add setting of the master side to the makefile

Browse Source
This commit is contained in:
Fred Sundvik 2016-07-06 15:36:45 +03:00
parent 4b45deb652
commit e5726b017a
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -59,6 +59,12 @@ ifndef KEYBOARD
KEYBOARD=planck KEYBOARD=planck
endif endif
MASTER ?= left
ifdef master
MASTER = $(master)
endif
# converts things to keyboards/subproject # converts things to keyboards/subproject
ifneq (,$(findstring /,$(KEYBOARD))) ifneq (,$(findstring /,$(KEYBOARD)))
TEMP:=$(KEYBOARD) TEMP:=$(KEYBOARD)
@ -212,6 +218,14 @@ ifeq ($(strip $(SERIAL_LINK_ENABLE)), yes)
VAPTH += $(SERIAL_PATH) VAPTH += $(SERIAL_PATH)
endif endif
ifeq ($(MASTER),right)
OPT_DEFS += -DMASTER_IS_ON_RIGHT
else
ifneq ($(MASTER),left)
$(error MASTER does not have a valid value(left/right))
endif
endif
# Optimize size but this may cause error "relocation truncated to fit" # Optimize size but this may cause error "relocation truncated to fit"
#EXTRALDFLAGS = -Wl,--relax #EXTRALDFLAGS = -Wl,--relax

9
tmk_core/common.mk
View File

@ -97,6 +97,15 @@ ifeq ($(strip $(KEYMAP_SECTION_ENABLE)), yes)
endif endif
endif endif
ifeq ($(MASTER),right)
OPT_DEFS += -DMASTER_IS_ON_RIGHT
else
ifneq ($(MASTER),left)
$(error MASTER does not have a valid value(left/right))
endif
endif
# Version string # Version string
OPT_DEFS += -DVERSION=$(shell (git describe --always --dirty || echo 'unknown') 2> /dev/null) OPT_DEFS += -DVERSION=$(shell (git describe --always --dirty || echo 'unknown') 2> /dev/null)