projects
/
qmk_firmware.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
592ef7c
)
Include the main Makefile before including Ergodox infinity drivers
author
Fred Sundvik
<fsundvik@gmail.com>
Sun, 10 Jul 2016 11:46:18 +0000
(14:46 +0300)
committer
Fred Sundvik
<fsundvik@gmail.com>
Fri, 29 Jul 2016 18:09:37 +0000
(21:09 +0300)
keyboards/ergodox/infinity/Makefile
patch
|
blob
|
history
diff --git
a/keyboards/ergodox/infinity/Makefile
b/keyboards/ergodox/infinity/Makefile
index d1ec266d0471bd103bb45422422773c068ef3cb3..ccb735a485beede2222294951d429ab0e754dc79 100644
(file)
--- a/
keyboards/ergodox/infinity/Makefile
+++ b/
keyboards/ergodox/infinity/Makefile
@@
-64,6
+64,10
@@
LCD_ENABLE ?= yes
LED_ENABLE ?= yes
LCD_BACKLIGHT_ENABLE ?= yes
+ifndef QUANTUM_DIR
+ include ../../../Makefile
+endif
+
ifdef LCD_ENABLE
include $(SUBPROJECT_PATH)/drivers/gdisp/st7565ergodox/driver.mk
endif
@@
-71,7
+75,3
@@
endif
ifdef LED_ENABLE
include $(SUBPROJECT_PATH)/drivers/gdisp/IS31FL3731C/driver.mk
endif
-
-ifndef QUANTUM_DIR
- include ../../../Makefile
-endif
\ No newline at end of file