diff options
Diffstat (limited to 'tools/showtext')
| -rw-r--r-- | tools/showtext/Makefile | 9 | ||||
| -rw-r--r-- | tools/showtext/showtext.c | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tools/showtext/Makefile b/tools/showtext/Makefile index d43c986..516f966 100644 --- a/tools/showtext/Makefile +++ b/tools/showtext/Makefile @@ -18,14 +18,11 @@ all: $(PRGNAME) # Implicit rules: %.o: %.c - $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXEXTRA) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< # Dependencies: -MAKEDEP = $(CXX) -MM -MG -DEPFILE = .dependencies -$(DEPFILE): Makefile - @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ +DEPFILE = $(OBJS:%.o=%.d) -include $(DEPFILE) @@ -36,7 +33,7 @@ $(PRGNAME): $(OBJS) install: $(PRGNAME) install -d $(BINDIR) - install -m 755 -o root -g root $(STRIP) $(PRGNAME) $(BINDIR) + install -m 755 -o root -g root $(HAVE_STRIP) $(PRGNAME) $(BINDIR) uninstall: rm -f $(BINDIR)/$(PRGNAME) diff --git a/tools/showtext/showtext.c b/tools/showtext/showtext.c index 333d9e3..00e6893 100644 --- a/tools/showtext/showtext.c +++ b/tools/showtext/showtext.c @@ -6,7 +6,9 @@ * This file is released under the GNU General Public License. Refer * to the COPYING file distributed with this package. * - * (c) 2004 Andreas Regel <andreas.regel AT powarman.de> + * (c) 2004-2010 Andreas Regel <andreas.regel AT powarman.de> + * (c) 2010-2011 Wolfgang Astleitner <mrwastl AT users sourceforge net> + * Andreas 'randy' Weinberger */ #include <stdio.h> @@ -35,7 +37,7 @@ void usage() { fprintf(stdout, "\n"); fprintf(stdout, "%s v%s\n", prgname, version); - fprintf(stdout, "%s is a tool to show a text on a LCD.\n", prgname); + fprintf(stdout, "%s is a tool to show a text on an LCD.\n", prgname); fprintf(stdout, "\n"); fprintf(stdout, " Usage: %s [-c CONFIGFILE] [-d DISPLAY] [-f FONT] [-x XPOS] [-y YPOS] [-uib] text [more text]\n\n", prgname); fprintf(stdout, " -c --config specifies the location of the config file\n"); @@ -269,7 +271,8 @@ int main(int argc, char *argv[]) bitmap->DrawText(x, y, bitmap->Width() - 1, text, &font); y += font.LineHeight(); } - lcd->SetScreen(bitmap->Data(), bitmap->Width(), bitmap->Height(), bitmap->LineSize()); +// lcd->SetScreen(bitmap->Data(), bitmap->Width(), bitmap->Height(), bitmap->LineSize()); + lcd->SetScreen(bitmap->Data(), bitmap->Width(), bitmap->Height()); lcd->Refresh(true); lcd->DeInit(); |