diff options
| author |  Fred Sundvik <fsundvik@gmail.com> | 2016-07-06 15:36:45 +0300 |
|---|---|---|
| committer | Fred Sundvik <fsundvik@gmail.com> | 2016-07-06 16:06:53 +0300 |
| commit | e5726b017a9de2922ea923818c6e215600f68a85 (patch) | |
| tree | 2d1470d076017af6d089a00f4bb317abdb331346 | |
| parent | 4b45deb652045aac73e5fdd7412a73bcef19c0c8 (diff) | |
| download | qmk_firmware-e5726b017a9de2922ea923818c6e215600f68a85.tar.gz | |
Add setting of the master side to the makefile
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | tmk_core/common.mk | 9 |
2 files changed, 23 insertions, 0 deletions
@@ -59,6 +59,12 @@ ifndef KEYBOARD KEYBOARD=planck endif +MASTER ?= left +ifdef master + MASTER = $(master) +endif + + # converts things to keyboards/subproject ifneq (,$(findstring /,$(KEYBOARD))) TEMP:=$(KEYBOARD) @@ -212,6 +218,14 @@ ifeq ($(strip $(SERIAL_LINK_ENABLE)), yes) VAPTH += $(SERIAL_PATH) 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" #EXTRALDFLAGS = -Wl,--relax diff --git a/tmk_core/common.mk b/tmk_core/common.mk index d71fba9bc..5bae0d762 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -97,6 +97,15 @@ ifeq ($(strip $(KEYMAP_SECTION_ENABLE)), yes) 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 OPT_DEFS += -DVERSION=$(shell (git describe --always --dirty || echo 'unknown') 2> /dev/null) |