diff options
author | Dave Chapman <dave@dchapman.com> | 2002-05-12 12:52:15 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2002-05-12 12:52:15 +0000 |
commit | 87758d84e6d5ca128cf3a48a09e1c57092148579 (patch) | |
tree | 023017cbe1d398e91336318d59203bbd6dc6cd95 /uisimulator | |
parent | ef5f97b4216042121a114afd5a9f1380283fb095 (diff) | |
download | rockbox-87758d84e6d5ca128cf3a48a09e1c57092148579.tar.gz rockbox-87758d84e6d5ca128cf3a48a09e1c57092148579.zip |
moved mpeg decoder to common
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@554 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-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.c | 2 | ||||
-rw-r--r-- | uisimulator/x11/Makefile | 3 |
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 @@ | |||
31 | #include "id3.h" | 31 | #include "id3.h" |
32 | 32 | ||
33 | #ifdef MPEG_PLAY | 33 | #ifdef MPEG_PLAY |
34 | #include "x11/mpegplay.h" | 34 | #include "common/mpegplay.h" |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | #define LINE_Y 1 /* initial line */ | 37 | #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 | |||
111 | version.o: $(LIBMADDIR)/version.c | 111 | version.o: $(LIBMADDIR)/version.c |
112 | $(CC) $(CFLAGS) -c $< -o $@ | 112 | $(CC) $(CFLAGS) -c $< -o $@ |
113 | 113 | ||
114 | mpegplay.o: $(APPDIR)/common/mpegplay.c | ||
115 | $(CC) $(CFLAGS) -c $< -o $@ | ||
116 | |||
114 | endif | 117 | endif |
115 | 118 | ||
116 | menu.o: $(APPDIR)/menu.c | 119 | menu.o: $(APPDIR)/menu.c |