Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makefile - MATRIX selection #19

Merged
merged 2 commits into from
Jun 2, 2015
Merged

Makefile - MATRIX selection #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59f2001
Added ability to set the MATRIX in build/make
cr3473 Jun 2, 2015
bb9e23c
Merge branch 'master' of github.com:jackhumbert/tmk_keyboard
cr3473 Jun 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions keyboard/planck/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

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

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

Expand Down
0 keyboard/planck/matrix.c → keyboard/planck/matrix_handwired.c
View file
Open in desktop
File renamed without changes.