diff options
Diffstat (limited to 'uisimulator/x11')
-rw-r--r-- | uisimulator/x11/Makefile | 4 | ||||
-rw-r--r-- | uisimulator/x11/sprintf.h | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 72862aae2c..2299be371d 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -31,8 +31,8 @@ endif | |||
31 | 31 | ||
32 | PREVAPPDIR= .. | 32 | PREVAPPDIR= .. |
33 | FIRMWAREDIR = ../../firmware | 33 | FIRMWAREDIR = ../../firmware |
34 | COMMON = $(FIRMWAREDIR)/common | ||
34 | DRIVERS = $(FIRMWAREDIR)/drivers | 35 | DRIVERS = $(FIRMWAREDIR)/drivers |
35 | LIBMADDIR = $(PREVAPPDIR)/common/libmad | ||
36 | TOOLSDIR = ../../tools | 36 | TOOLSDIR = ../../tools |
37 | DOCSDIR = ../../docs | 37 | DOCSDIR = ../../docs |
38 | 38 | ||
@@ -88,7 +88,7 @@ else | |||
88 | LCDSRSC = lcd-playersim.c lcd-player.c font-player.c lcd-player-charset.c | 88 | LCDSRSC = lcd-playersim.c lcd-player.c font-player.c lcd-player-charset.c |
89 | endif | 89 | endif |
90 | FIRMSRCS = $(LCDSRSC) id3.c debug.c usb.c mpeg.c power.c\ | 90 | FIRMSRCS = $(LCDSRSC) id3.c debug.c usb.c mpeg.c power.c\ |
91 | powermgmt.c panic.c mp3data.c | 91 | powermgmt.c panic.c mp3data.c sprintf.c |
92 | 92 | ||
93 | APPS = main.c tree.c menu.c credits.c main_menu.c language.c\ | 93 | APPS = main.c tree.c menu.c credits.c main_menu.c language.c\ |
94 | playlist.c wps.c wps-display.c settings.c status.c icons.c\ | 94 | playlist.c wps.c wps-display.c settings.c status.c icons.c\ |
diff --git a/uisimulator/x11/sprintf.h b/uisimulator/x11/sprintf.h index 16c42333a3..5daa037cea 100644 --- a/uisimulator/x11/sprintf.h +++ b/uisimulator/x11/sprintf.h | |||
@@ -1,5 +1,10 @@ | |||
1 | #include <stdarg.h> | 1 | #include <stdarg.h> |
2 | #include <stdio.h> | 2 | #include <stdio.h> |
3 | 3 | ||
4 | int snprintf (char *buf, size_t size, const char *fmt, ...); | 4 | int rockbox_snprintf (char *buf, int size, const char *fmt, ...); |
5 | int rockbox_vsnprintf (char *buf, int size, const char *fmt, va_list ap); | ||
6 | int rockbox_fprintf (int fd, const char *fmt, ...); | ||
5 | 7 | ||
8 | #define snprintf rockbox_snprintf | ||
9 | #define vsnprintf rockbox_vsnprintf | ||
10 | #define fprintf rockbox_fprintf | ||