summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJack Humbert2016-07-07 09:59:33 -0400
committerGitHub2016-07-07 09:59:33 -0400
commitad43d450ca1b988d196da80e2a745f45f24068f6 (patch)
treea479c21240dba88cd593e85cac6926b17924984d /Makefile
parent589df84d6cd19ad7d776cc19bcddade1cd178ddc (diff)
parentcaedec92d2c22480313c43a364408fb920c55364 (diff)
Merge pull request #490 from fredizzimo/integrate_visualizer
Integrate visualizer for ChibiOS and Infinity Ergodox
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 7 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 7c00ce2cc..a7a10bf32 100644
--- a/Makefile
+++ b/Makefile
@@ -218,14 +218,6 @@ 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
@@ -257,10 +249,17 @@ ifeq ($(PLATFORM),AVR)
else ifeq ($(PLATFORM),CHIBIOS)
include $(TMK_PATH)/protocol/chibios.mk
include $(TMK_PATH)/chibios.mk
+ OPT_OS = chibios
else
$(error Unknown platform)
endif
+ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
+ VISUALIZER_DIR = $(QUANTUM_DIR)/visualizer
+ VISUALIZER_PATH = $(QUANTUM_PATH)/visualizer
+ include $(VISUALIZER_PATH)/visualizer.mk
+endif
+
include $(TMK_PATH)/rules.mk
GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d-%H:%M:%S")