aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Saunders <trsaunders@gmail.com>2012-07-26 17:05:54 +0100
committerThomas Saunders <trsaunders@gmail.com>2012-07-26 17:05:54 +0100
commit54a8a4d1e3815141e5c1ec0790b0578f7de3a842 (patch)
tree31b6570b2f53c5e776aaa3bf2f3b0ac36a89c8f0
parent74a8fb55a3c4852be26058727f6a54b9a2ed88ae (diff)
downloaduGFX-54a8a4d1e3815141e5c1ec0790b0578f7de3a842.tar.gz
uGFX-54a8a4d1e3815141e5c1ec0790b0578f7de3a842.tar.bz2
uGFX-54a8a4d1e3815141e5c1ec0790b0578f7de3a842.zip
allow LCDLIB to be defined in Makefile
-rw-r--r--lcd.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/lcd.mk b/lcd.mk
index 3354330d..020d70a3 100644
--- a/lcd.mk
+++ b/lcd.mk
@@ -1,4 +1,7 @@
-LCDLIB = $(CHIBIOS)/ext/lcd
+# don't re-define LCDLIB if it has been set elsewhere, e.g in Makefile
+ifeq ($(LCDLIB),)
+ LCDLIB = $(CHIBIOS)/ext/lcd
+endif
include $(LCDLIB)/drivers/drivers.mk
include $(LCDLIB)/glcd/glcd.mk