aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTectu <joel@unormal.org>2012-07-26 09:10:59 -0700
committerTectu <joel@unormal.org>2012-07-26 09:10:59 -0700
commita97595f289db1af6a78b8f182e63bd153f89e76f (patch)
treed9bca888454153b245b09983cef10036f46a4750
parent3c9425f594260b1cd037178ec0b84d1eab3fda0e (diff)
parent54a8a4d1e3815141e5c1ec0790b0578f7de3a842 (diff)
downloaduGFX-a97595f289db1af6a78b8f182e63bd153f89e76f.tar.gz
uGFX-a97595f289db1af6a78b8f182e63bd153f89e76f.tar.bz2
uGFX-a97595f289db1af6a78b8f182e63bd153f89e76f.zip
Merge pull request #21 from trsaunders/master
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