diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2002-09-12 13:33:59 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2002-09-12 13:33:59 +0000 |
| commit | 93b231c69366563ba441dc4907bfb036fe3b4c55 (patch) | |
| tree | 0783ad028211f59e63925a354e4260a7209ffa24 /uisimulator | |
| parent | 5ed78ea80cdaa0ede4df89568f0781fa477a5738 (diff) | |
| download | rockbox-93b231c69366563ba441dc4907bfb036fe3b4c55.tar.gz rockbox-93b231c69366563ba441dc4907bfb036fe3b4c55.zip | |
Greg Haerr's new loadable font. No more #ifdef font-style, removed old
propfont and loadable font code. New font file format.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2269 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
| -rw-r--r-- | uisimulator/x11/Makefile | 30 | ||||
| -rw-r--r-- | uisimulator/x11/uibasic.c | 1 |
2 files changed, 21 insertions, 10 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index d2b109e443..c6f86d40ad 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile @@ -76,13 +76,8 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall APPCFLAGS = $(DEBUG) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(APPINCLUDES) -W -Wall -FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c usb.c mpeg.c power.c powermgmt.c - -ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(DEFINES))) - FIRMSRCS += unicode.c ajf.c panic.c - EXTRA_TARGETS = $(OBJDIR)/archos/system.ajf - SYSTEM_FONT = $(FIRMWAREDIR)/fonts/alt6x10.bdf -endif +FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c usb.c mpeg.c power.c\ + powermgmt.c font.c X5x8.c loadfont.c panic.c APPS = main.c tree.c menu.c credits.c main_menu.c\ playlist.c showtext.c wps.c wps-display.c settings.c status.c icons.c @@ -110,9 +105,6 @@ clean: $(RM) $(OBJS) *~ core $(TARGET) $(CLIENTS) $(RM) -r $(DEPS) -$(OBJDIR)/archos/system.ajf: $(TOOLSDIR)/bdf2ajf $(SYSTEM_FONT) - $(TOOLSDIR)/bdf2ajf -f $(SYSTEM_FONT) -o $(OBJDIR)/archos/system.ajf - distclean: clean $(RM) config.cache @@ -227,6 +219,24 @@ $(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c $(OBJDIR)/chartables.o: $(FIRMWAREDIR)/chartables.c $(CC) $(APPCFLAGS) -c $< -o $@ +$(OBJDIR)/X5x8.o: $(FIRMWAREDIR)/X5x8.c + $(CC) $(APPCFLAGS) -c $< -o $@ + +$(OBJDIR)/X6x9.o: $(FIRMWAREDIR)/X6x9.c + $(CC) $(APPCFLAGS) -c $< -o $@ + +$(OBJDIR)/timR08.o: $(FIRMWAREDIR)/timR08.c + $(CC) $(APPCFLAGS) -c $< -o $@ + +$(OBJDIR)/courB08.o: $(FIRMWAREDIR)/courB08.c + $(CC) $(APPCFLAGS) -c $< -o $@ + +$(OBJDIR)/font.o: $(FIRMWAREDIR)/font.c + $(CC) $(APPCFLAGS) -c $< -o $@ + +$(OBJDIR)/loadfont.o: $(FIRMWAREDIR)/loadfont.c + $(CC) $(APPCFLAGS) -c $< -o $@ + $(OBJDIR)/settings.o: $(APPDIR)/settings.c $(CC) $(APPCFLAGS) -c $< -o $@ diff --git a/uisimulator/x11/uibasic.c b/uisimulator/x11/uibasic.c index 165b1cebe9..2eac2f8e06 100644 --- a/uisimulator/x11/uibasic.c +++ b/uisimulator/x11/uibasic.c @@ -198,6 +198,7 @@ screenhack (Display *the_dpy, Window the_window) screen_redraw(); #ifdef HAVE_LCD_CHARCELLS + // FIXME?? lcd_setfont(2); #endif |