aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTectu <joel@unormal.org>2012-08-13 13:44:43 +0200
committerTectu <joel@unormal.org>2012-08-13 13:44:43 +0200
commit6982d7d076ac480fa46bb1c69ef49963c7bebb18 (patch)
tree79431b60795152d288e274c77f0cf726cc21989b
parentc14a813c6ee78b7f55bfaf40ae4012a87d6348cf (diff)
downloaduGFX-6982d7d076ac480fa46bb1c69ef49963c7bebb18.tar.gz
uGFX-6982d7d076ac480fa46bb1c69ef49963c7bebb18.tar.bz2
uGFX-6982d7d076ac480fa46bb1c69ef49963c7bebb18.zip
moved console to src/ and include/
-rw-r--r--console/console.mk4
-rw-r--r--console/readme.txt3
-rw-r--r--include/console.h (renamed from console/console.h)0
-rw-r--r--lcd.mk5
-rw-r--r--src/console.c (renamed from console/console.c)0
5 files changed, 2 insertions, 10 deletions
diff --git a/console/console.mk b/console/console.mk
deleted file mode 100644
index 58c1b8f1..00000000
--- a/console/console.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-LCDSRC += $(LCDLIB)/console/console.c
-
-LCDINC += $(LCDLIB)/console
-
diff --git a/console/readme.txt b/console/readme.txt
deleted file mode 100644
index 806fdf98..00000000
--- a/console/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This directory contains any files which are needed by the
-console implementation.
-
diff --git a/console/console.h b/include/console.h
index edd8498e..edd8498e 100644
--- a/console/console.h
+++ b/include/console.h
diff --git a/lcd.mk b/lcd.mk
index c49ddc61..b2e7d784 100644
--- a/lcd.mk
+++ b/lcd.mk
@@ -3,10 +3,9 @@ ifeq ($(LCDLIB),)
LCDLIB = $(CHIBIOS)/ext/lcd
endif
-include $(LCDLIB)/console/console.mk
-
LCDSRC += $(LCDLIB)/src/gdisp.c \
$(LCDLIB)/src/gdisp_fonts.c \
- $(LCDLIB)/src/touchpad.c
+ $(LCDLIB)/src/touchpad.c \
+ $(LCDLIB)/src/console.c
LCDINC += $(LCDLIB)/include
diff --git a/console/console.c b/src/console.c
index 55bc3312..55bc3312 100644
--- a/console/console.c
+++ b/src/console.c