diff options
| author | Andrew Hannam <andrewh@inmarket.com.au> | 2012-08-08 10:37:45 -0700 |
|---|---|---|
| committer | Andrew Hannam <andrewh@inmarket.com.au> | 2012-08-08 10:37:45 -0700 |
| commit | f326f5786f7be89667196476bb926f03764c82d1 (patch) | |
| tree | cea56b0491bf9ad87f96c77d51796d2a4dc51236 /lcd.mk | |
| parent | 9f33efcf21c6dc63187d7d77ff94e438a2733777 (diff) | |
| parent | d2e660cc1350c16e0276a53ec36574f6be0390cc (diff) | |
| download | uGFX-f326f5786f7be89667196476bb926f03764c82d1.tar.gz uGFX-f326f5786f7be89667196476bb926f03764c82d1.tar.bz2 uGFX-f326f5786f7be89667196476bb926f03764c82d1.zip | |
Merge pull request #1 from Tectu/master
Merge Tectu Changes
Diffstat (limited to 'lcd.mk')
| -rw-r--r-- | lcd.mk | 44 |
1 files changed, 26 insertions, 18 deletions
@@ -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) + |