diff options
| author | Andreas Regel <andreas.regel@gmx.de> | 2016-10-20 20:49:18 +0200 |
|---|---|---|
| committer | Andreas Regel <andreas.regel@gmx.de> | 2016-10-20 20:49:18 +0200 |
| commit | 7958e1b058b98ecf8d8a3fbeebbee71572a2ac21 (patch) | |
| tree | 0f336c3f9784c4afa1c954ed2081eb164c463b43 /tools | |
| parent | d4622366d9886fcb62a74507af362dbe73573bcc (diff) | |
| parent | aacb78d4335e498417835d518c64b33acb58c749 (diff) | |
| download | graphlcd-base-7958e1b058b98ecf8d8a3fbeebbee71572a2ac21.tar.gz graphlcd-base-7958e1b058b98ecf8d8a3fbeebbee71572a2ac21.tar.bz2 | |
Merge branch 'master' into touchcol
# Conflicts:
# HISTORY
# Makefile
# glcddrivers/Makefile
# glcddrivers/drivers.c
# glcddrivers/drivers.h
# glcddrivers/futabaMDM166A.c
# glcddrivers/futabaMDM166A.h
# glcddrivers/image.c
# glcddrivers/noritake800.c
# glcddrivers/noritake800.h
# glcdgraphics/Makefile
# glcdgraphics/bitmap.c
# glcdgraphics/bitmap.h
# glcdgraphics/font.c
# glcdgraphics/font.h
# glcdskin/config.h
# glcdskin/display.c
# glcdskin/display.h
# glcdskin/object.c
# glcdskin/object.h
# glcdskin/parser.c
# graphlcd.conf
# tools/convpic/Makefile
# tools/crtfont/Makefile
# tools/genfont/Makefile
# tools/lcdtestpattern/Makefile
# tools/showpic/Makefile
# tools/showpic/showpic.c
# tools/showtext/Makefile
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/convpic/Makefile | 2 | ||||
| -rw-r--r-- | tools/crtfont/Makefile | 2 | ||||
| -rw-r--r-- | tools/genfont/Makefile | 2 | ||||
| -rw-r--r-- | tools/lcdtestpattern/Makefile | 2 | ||||
| -rw-r--r-- | tools/showpic/Makefile | 2 | ||||
| -rw-r--r-- | tools/showtext/Makefile | 2 | ||||
| -rw-r--r-- | tools/showtext/showtext.c | 1 |
7 files changed, 7 insertions, 6 deletions
diff --git a/tools/convpic/Makefile b/tools/convpic/Makefile index 6029d5f..3d57aa4 100644 --- a/tools/convpic/Makefile +++ b/tools/convpic/Makefile @@ -18,7 +18,7 @@ all: $(PRGNAME) # Implicit rules: %.o: %.c - $(CXX) $(CXXEXTRA) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXEXTRA) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< # Dependencies: diff --git a/tools/crtfont/Makefile b/tools/crtfont/Makefile index 64b1fb6..6c6abdf 100644 --- a/tools/crtfont/Makefile +++ b/tools/crtfont/Makefile @@ -17,7 +17,7 @@ all: $(PRGNAME) # Implicit rules: %.o: %.c - $(CXX) $(CXXEXTRA) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXEXTRA) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< # Dependencies: diff --git a/tools/genfont/Makefile b/tools/genfont/Makefile index 9a699dd..f97d8e7 100644 --- a/tools/genfont/Makefile +++ b/tools/genfont/Makefile @@ -20,7 +20,7 @@ all: $(PRGNAME) # Implicit rules: %.o: %.c - $(CXX) $(CXXEXTRA) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXEXTRA) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< # Dependencies: diff --git a/tools/lcdtestpattern/Makefile b/tools/lcdtestpattern/Makefile index c004253..e29305b 100644 --- a/tools/lcdtestpattern/Makefile +++ b/tools/lcdtestpattern/Makefile @@ -18,7 +18,7 @@ all: $(PRGNAME) # Implicit rules: %.o: %.c - $(CXX) $(CXXEXTRA) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXEXTRA) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< # Dependencies: diff --git a/tools/showpic/Makefile b/tools/showpic/Makefile index e9bc83c..de7560a 100644 --- a/tools/showpic/Makefile +++ b/tools/showpic/Makefile @@ -18,7 +18,7 @@ all: $(PRGNAME) # Implicit rules: %.o: %.c - $(CXX) $(CXXEXTRA) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXEXTRA) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< # Dependencies: diff --git a/tools/showtext/Makefile b/tools/showtext/Makefile index 62196aa..516f966 100644 --- a/tools/showtext/Makefile +++ b/tools/showtext/Makefile @@ -18,7 +18,7 @@ all: $(PRGNAME) # Implicit rules: %.o: %.c - $(CXX) $(CXXEXTRA) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXEXTRA) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< # Dependencies: diff --git a/tools/showtext/showtext.c b/tools/showtext/showtext.c index bc7879c..00e6893 100644 --- a/tools/showtext/showtext.c +++ b/tools/showtext/showtext.c @@ -277,6 +277,7 @@ int main(int argc, char *argv[]) lcd->DeInit(); delete lcd; + delete bitmap; return 0; } |