Merge pull request #19 from cr3473/master

Makefile - MATRIX selection
2015-06-02 15:42:58 -04:00 · 2015-06-02 15:42:58 -04:00 · 6001a9347b
commit 6001a9347b
parent 81c672391a bb9e23c319
2 changed files with 7 additions and 2 deletions
--- a/keyboard/planck/Makefile
+++ b/keyboard/planck/Makefile
@ -47,13 +47,18 @@ TOP_DIR = ../..
 # Directory keyboard dependent files exist
 TARGET_DIR = .

+# Default to PCB matrix
+ifndef MATRIX
+	MATRIX=matrix_pcb.c
+endif

+$(warning MATRIX: $(MATRIX))

 # # project specific files
 ifdef COMMON

 	SRC = keymap_common.c \
-	matrix_pcb.c \
+	$(MATRIX) \
 	led.c \
 	backlight.c

@ -66,7 +71,7 @@ endif
 else

 SRC = extended_keymap_common.c \
-	matrix_pcb.c \
+	$(MATRIX) \
 	led.c \
 	backlight.c

--- a/keyboard/planck/matrix_handwired.c
+++ b/keyboard/planck/matrix_handwired.c