aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTectu <joel@unormal.org>2012-08-08 13:35:04 +0200
committerTectu <joel@unormal.org>2012-08-08 13:35:04 +0200
commite1eab0befd6719c2e38da8a430a34cee1bc46539 (patch)
tree4ae455382d213c7203638567fe968b61e38c6d25
parent6195e6763b597e22175213999cc12a979862b207 (diff)
downloaduGFX-e1eab0befd6719c2e38da8a430a34cee1bc46539.tar.gz
uGFX-e1eab0befd6719c2e38da8a430a34cee1bc46539.tar.bz2
uGFX-e1eab0befd6719c2e38da8a430a34cee1bc46539.zip
lcd.mk is now main Makefile again
-rw-r--r--lcd.mk44
1 files changed, 26 insertions, 18 deletions
diff --git a/lcd.mk b/lcd.mk
index 020d70a3..47120a13 100644
--- a/lcd.mk
+++ b/lcd.mk
@@ -3,21 +3,29 @@ ifeq ($(LCDLIB),)
LCDLIB = $(CHIBIOS)/ext/lcd
endif
-include $(LCDLIB)/drivers/drivers.mk
-include $(LCDLIB)/glcd/glcd.mk
-include $(LCDLIB)/touchpad/touchpad.mk
-include $(LCDLIB)/graph/graph.mk
-include $(LCDLIB)/gui/gui.mk
-
-LCDSRC = $(LCD_DRIVERS_SRC) \
- $(LCD_GLCD_SRC) \
- $(LCD_TOUCHPAD_SRC) \
- $(LCD_GRAPH_SRC) \
- $(LCD_GUI_SRC)
-
-LCDINC = $(LCDLIB) \
- $(LCD_DRIVERS_INC) \
- $(LCD_GLCD_INC) \
- $(LCD_TOUCHPAD_INC) \
- $(LCD_GRAPH_INC) \
- $(LCD_GUI_INC)
+
+include $(LCDLIB)/halext/halext.mk
+
+
+
+# this is used for the old structure - will get removed soon
+
+#include $(LCDLIB)/drivers/drivers.mk
+#include $(LCDLIB)/glcd/glcd.mk
+#include $(LCDLIB)/touchpad/touchpad.mk
+#include $(LCDLIB)/graph/graph.mk
+#include $(LCDLIB)/gui/gui.mk
+
+#LCDSRC = $(LCD_DRIVERS_SRC) \
+# $(LCD_GLCD_SRC) \
+# $(LCD_TOUCHPAD_SRC) \
+# $(LCD_GRAPH_SRC) \
+# $(LCD_GUI_SRC)
+
+#LCDINC = $(LCDLIB) \
+# $(LCD_DRIVERS_INC) \
+# $(LCD_GLCD_INC) \
+# $(LCD_TOUCHPAD_INC) \
+# $(LCD_GRAPH_INC) \
+# $(LCD_GUI_INC)
+