diff options
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/x11/Makefile | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index e64ae6f36c..b34bb48e08 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -25,6 +25,7 @@ FIRMWAREDIR = ../../firmware | |||
25 | DRIVERS = $(FIRMWAREDIR)/drivers | 25 | DRIVERS = $(FIRMWAREDIR)/drivers |
26 | COMMON = $(FIRMWAREDIR)/common | 26 | COMMON = $(FIRMWAREDIR)/common |
27 | LIBMADDIR = $(PREVAPPDIR)/common/libmad | 27 | LIBMADDIR = $(PREVAPPDIR)/common/libmad |
28 | TOOLSDIR = ../../tools | ||
28 | 29 | ||
29 | CC = gcc | 30 | CC = gcc |
30 | RM = rm -f | 31 | RM = rm -f |
@@ -42,7 +43,7 @@ DISPLAY = -DHAVE_LCD_BITMAP | |||
42 | KEYPAD = -DHAVE_RECORDER_KEYPAD | 43 | KEYPAD = -DHAVE_RECORDER_KEYPAD |
43 | 44 | ||
44 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 45 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
45 | $(KEYPAD) $(DISPLAY) #-DLCD_PROPFONTS | 46 | $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) |
46 | 47 | ||
47 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl | 48 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl |
48 | 49 | ||
@@ -69,11 +70,17 @@ ifdef MPEG_PLAY | |||
69 | INCLUDES += -I$(PREVAPPDIR)/common | 70 | INCLUDES += -I$(PREVAPPDIR)/common |
70 | endif | 71 | endif |
71 | 72 | ||
72 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall | 73 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall |
73 | 74 | ||
74 | APPCFLAGS = $(DEBUG) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(APPINCLUDES) -W -Wall | 75 | APPCFLAGS = $(DEBUG) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(APPINCLUDES) -W -Wall |
75 | 76 | ||
76 | FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c usb.c mpeg.c power.c powermgmt.c | 77 | FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c usb.c mpeg.c power.c powermgmt.c |
78 | |||
79 | ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(DEFINES))) | ||
80 | FIRMSRCS += unicode.c ajf.c panic.c | ||
81 | EXTRA_TARGETS = $(OBJDIR)/archos/system.ajf | ||
82 | SYSTEM_FONT = $(FIRMWAREDIR)/fonts/alt6x10.bdf | ||
83 | endif | ||
77 | 84 | ||
78 | APPS = main.c tree.c menu.c credits.c main_menu.c\ | 85 | APPS = main.c tree.c menu.c credits.c main_menu.c\ |
79 | playlist.c showtext.c wps.c settings.c status.c | 86 | playlist.c showtext.c wps.c settings.c status.c |
@@ -95,12 +102,15 @@ endif | |||
95 | 102 | ||
96 | OBJS := $(SRCS:%.c=$(OBJDIR)/%.o) | 103 | OBJS := $(SRCS:%.c=$(OBJDIR)/%.o) |
97 | 104 | ||
98 | all: $(TARGET) | 105 | all: $(TARGET) $(EXTRA_TARGETS) |
99 | 106 | ||
100 | clean: | 107 | clean: |
101 | $(RM) $(OBJS) *~ core $(TARGET) $(CLIENTS) | 108 | $(RM) $(OBJS) *~ core $(TARGET) $(CLIENTS) |
102 | $(RM) -r $(DEPS) | 109 | $(RM) -r $(DEPS) |
103 | 110 | ||
111 | $(OBJDIR)/archos/system.ajf: $(TOOLSDIR)/bdf2ajf $(SYSTEM_FONT) | ||
112 | $(TOOLSDIR)/bdf2ajf -f $(SYSTEM_FONT) -o $(OBJDIR)/archos/system.ajf | ||
113 | |||
104 | distclean: clean | 114 | distclean: clean |
105 | $(RM) config.cache | 115 | $(RM) config.cache |
106 | 116 | ||
@@ -218,6 +228,9 @@ $(OBJDIR)/id3.o: $(FIRMWAREDIR)/id3.c | |||
218 | $(OBJDIR)/debug.o: $(FIRMWAREDIR)/debug.c | 228 | $(OBJDIR)/debug.o: $(FIRMWAREDIR)/debug.c |
219 | $(CC) $(CFLAGS) -c $< -o $@ | 229 | $(CC) $(CFLAGS) -c $< -o $@ |
220 | 230 | ||
231 | $(OBJDIR)/panic.o: $(FIRMWAREDIR)/panic.c | ||
232 | $(CC) $(CFLAGS) -c $< -o $@ | ||
233 | |||
221 | $(OBJDIR)/mpeg.o: $(FIRMWAREDIR)/mpeg.c | 234 | $(OBJDIR)/mpeg.o: $(FIRMWAREDIR)/mpeg.c |
222 | $(CC) $(CFLAGS) -c $< -o $@ | 235 | $(CC) $(CFLAGS) -c $< -o $@ |
223 | 236 | ||
@@ -230,6 +243,12 @@ $(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c | |||
230 | $(OBJDIR)/powermgmt.o: $(FIRMWAREDIR)/powermgmt.c | 243 | $(OBJDIR)/powermgmt.o: $(FIRMWAREDIR)/powermgmt.c |
231 | $(CC) $(CFLAGS) -c $< -o $@ | 244 | $(CC) $(CFLAGS) -c $< -o $@ |
232 | 245 | ||
246 | $(OBJDIR)/unicode.o: $(FIRMWAREDIR)/unicode.c | ||
247 | $(CC) $(CFLAGS) -c $< -o $@ | ||
248 | |||
249 | $(OBJDIR)/ajf.o: $(FIRMWAREDIR)/ajf.c | ||
250 | $(CC) $(CFLAGS) -c $< -o $@ | ||
251 | |||
233 | $(OBJDIR)/stubs.o: ../common/stubs.c | 252 | $(OBJDIR)/stubs.o: ../common/stubs.c |
234 | $(CC) $(CFLAGS) -c $< -o $@ | 253 | $(CC) $(CFLAGS) -c $< -o $@ |
235 | 254 | ||