summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--uisimulator/x11/Makefile6
-rw-r--r--uisimulator/x11/mpeg.c11
2 files changed, 16 insertions, 1 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index bda4136274..2b2dab1960 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -69,7 +69,8 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES)
69 69
70FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c 70FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c
71 71
72APPS = main.c tree.c play.c menu.c credits.c main_menu.c sound_menu.c 72APPS = main.c tree.c play.c menu.c credits.c main_menu.c sound_menu.c \
73 playlist.c
73 74
74ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) 75ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
75 APPS += tetris.c screensaver.c icons.c bmp.c 76 APPS += tetris.c screensaver.c icons.c bmp.c
@@ -167,6 +168,9 @@ $(OBJDIR)/play.o: $(APPDIR)/play.c
167$(OBJDIR)/tree.o: $(APPDIR)/tree.c 168$(OBJDIR)/tree.o: $(APPDIR)/tree.c
168 $(CC) $(CFLAGS) -c $< -o $@ 169 $(CC) $(CFLAGS) -c $< -o $@
169 170
171$(OBJDIR)/playlist.o: $(APPDIR)/playlist.c
172 $(CC) $(CFLAGS) -c $< -o $@
173
170$(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c 174$(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c
171 $(CC) $(CFLAGS) -c $< -o $@ 175 $(CC) $(CFLAGS) -c $< -o $@
172 176
diff --git a/uisimulator/x11/mpeg.c b/uisimulator/x11/mpeg.c
index 38cdb104e5..0f3680d737 100644
--- a/uisimulator/x11/mpeg.c
+++ b/uisimulator/x11/mpeg.c
@@ -17,6 +17,8 @@
17 * 17 *
18 ****************************************************************************/ 18 ****************************************************************************/
19 19
20#include "debug.h"
21
20/* This file is for emulating some of the mpeg controlling functions of 22/* This file is for emulating some of the mpeg controlling functions of
21 the target */ 23 the target */
22 24
@@ -35,3 +37,12 @@ void mpeg_treble(void)
35void mpeg_stop(void) 37void mpeg_stop(void)
36{ 38{
37} 39}
40
41#ifndef MPEGPLAY
42void mpeg_play(char *tune)
43{
44 DEBUGF("We instruct the MPEG thread to play %s for us\n",
45 tune);
46}
47
48#endif