diff options
Diffstat (limited to 'uisimulator')
| -rw-r--r-- | uisimulator/win32/Makefile | 10 | ||||
| -rw-r--r-- | uisimulator/x11/Makefile | 19 |
2 files changed, 8 insertions, 21 deletions
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index 1b0464779c..382e71b886 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile @@ -63,7 +63,7 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall -mwindows APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall -mwindows FIRMSRCS = lcd.c power.c sprintf.c id3.c usb.c \ - mpeg.c powermgmt.c font.c loadfont.c X5x8.c + mpeg.c powermgmt.c font.c sysfont.c APPS = main.c tree.c menu.c credits.c main_menu.c icons.c \ playlist.c showtext.c wps.c wps-display.c settings.c status.c @@ -187,11 +187,9 @@ $(OBJDIR)/id3.o: $(FIRMWAREDIR)/id3.c $(OBJDIR)/font.o: $(FIRMWAREDIR)/font.c $(CC) $(CFLAGS) -c $< -o $@ -$(OBJDIR)/loadfont.o: $(FIRMWAREDIR)/loadfont.c - $(CC) $(CFLAGS) -c $< -o $@ - -$(OBJDIR)/X5x8.o: $(FIRMWAREDIR)/X5x8.c - $(CC) $(CFLAGS) -c $< -o $@ +$(OBJDIR)/sysfont.o: $(FIRMWAREDIR)/fonts/clR6x8.bdf + $(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $< + $(CC) $(APPCFLAGS) -c $(OBJDIR)/sysfont.c -o $@ $(OBJDIR)/status.o: $(APPDIR)/status.c $(CC) $(APPCFLAGS) -c $< -o $@ diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 821e13553f..3f9b999acb 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile @@ -78,7 +78,7 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall APPCFLAGS = $(DEBUG) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(APPINCLUDES) -W -Wall FIRMSRCS = lcd.c sprintf.c id3.c debug.c usb.c mpeg.c power.c\ - powermgmt.c font.c X5x8.c loadfont.c panic.c + powermgmt.c font.c panic.c sysfont.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 @@ -221,24 +221,13 @@ $(OBJDIR)/lang.o: $(APPDIR)/lang/$(LANGUAGE).lang $(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c $(CC) $(CFLAGS) -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)/sysfont.o: $(FIRMWAREDIR)/fonts/clR6x8.bdf + $(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $< + $(CC) $(APPCFLAGS) -c $(OBJDIR)/sysfont.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 $@ |