diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2015-06-02 15:42:58 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2015-06-02 15:42:58 -0400 |
| commit | 6001a9347b1b782da14acb672d4a610bda0455eb (patch) | |
| tree | a25942c59393cfb56e7aba46ffd35c3575765773 /keyboard | |
| parent | 81c672391a041b74230b6a0f55384ff0dc90ca0a (diff) | |
| parent | bb9e23c3196e87dbae64e3bd5ac8df6e1f840e8a (diff) | |
Merge pull request #19 from cr3473/master
Makefile - MATRIX selection
Diffstat (limited to 'keyboard')
| -rw-r--r-- | keyboard/planck/Makefile | 9 | ||||
| -rw-r--r-- | keyboard/planck/matrix_handwired.c (renamed from keyboard/planck/matrix.c) | 0 |
2 files changed, 7 insertions, 2 deletions
diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index 964e6832ea..ad25854e6d 100644 --- 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 diff --git a/keyboard/planck/matrix.c b/keyboard/planck/matrix_handwired.c index 2f2dbdb108..2f2dbdb108 100644 --- a/keyboard/planck/matrix.c +++ b/keyboard/planck/matrix_handwired.c |