summaryrefslogtreecommitdiffstats
path: root/uisimulator/x11/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'uisimulator/x11/Makefile')
-rw-r--r--uisimulator/x11/Makefile19
1 files changed, 4 insertions, 15 deletions
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 $@