summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--uisimulator/common/mpegplay.c (renamed from uisimulator/x11/mpegplay.c)0
-rw-r--r--uisimulator/common/mpegplay.h (renamed from uisimulator/x11/mpegplay.h)0
-rw-r--r--uisimulator/play.c2
-rw-r--r--uisimulator/x11/Makefile3
4 files changed, 4 insertions, 1 deletions
diff --git a/uisimulator/x11/mpegplay.c b/uisimulator/common/mpegplay.c
index da02ec9de4..da02ec9de4 100644
--- a/uisimulator/x11/mpegplay.c
+++ b/uisimulator/common/mpegplay.c
diff --git a/uisimulator/x11/mpegplay.h b/uisimulator/common/mpegplay.h
index cde9fe183f..cde9fe183f 100644
--- a/uisimulator/x11/mpegplay.h
+++ b/uisimulator/common/mpegplay.h
diff --git a/uisimulator/play.c b/uisimulator/play.c
index 735597962e..3681a7e133 100644
--- a/uisimulator/play.c
+++ b/uisimulator/play.c
@@ -31,7 +31,7 @@
#include "id3.h"
#ifdef MPEG_PLAY
-#include "x11/mpegplay.h"
+#include "common/mpegplay.h"
#endif
#define LINE_Y 1 /* initial line */
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index 6bbebd6c5d..b73fd08bf3 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -111,6 +111,9 @@ timer.o: $(LIBMADDIR)/timer.c
version.o: $(LIBMADDIR)/version.c
$(CC) $(CFLAGS) -c $< -o $@
+mpegplay.o: $(APPDIR)/common/mpegplay.c
+ $(CC) $(CFLAGS) -c $< -o $@
+
endif
menu.o: $(APPDIR)/menu.c