summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2002-05-12 12:52:15 +0000
committerDave Chapman <dave@dchapman.com>2002-05-12 12:52:15 +0000
commit87758d84e6d5ca128cf3a48a09e1c57092148579 (patch)
tree023017cbe1d398e91336318d59203bbd6dc6cd95
parentef5f97b4216042121a114afd5a9f1380283fb095 (diff)
downloadrockbox-87758d84e6d5ca128cf3a48a09e1c57092148579.zip
rockbox-87758d84e6d5ca128cf3a48a09e1c57092148579.tar.gz
rockbox-87758d84e6d5ca128cf3a48a09e1c57092148579.tar.bz2
rockbox-87758d84e6d5ca128cf3a48a09e1c57092148579.tar.xz
moved mpeg decoder to common
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@554 a1c6a512-1295-4272-9138-f99709370657
-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 da02ec9..da02ec9 100644
--- a/uisimulator/x11/mpegplay.c
+++ b/uisimulator/common/mpegplay.c
diff --git a/uisimulator/x11/mpegplay.h b/uisimulator/common/mpegplay.h
index cde9fe1..cde9fe1 100644
--- a/uisimulator/x11/mpegplay.h
+++ b/uisimulator/common/mpegplay.h
diff --git a/uisimulator/play.c b/uisimulator/play.c
index 7355979..3681a7e 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 6bbebd6..b73fd08 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