From 87758d84e6d5ca128cf3a48a09e1c57092148579 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Sun, 12 May 2002 12:52:15 +0000 Subject: [PATCH] moved mpeg decoder to common git-svn-id: svn://svn.rockbox.org/rockbox/trunk@554 a1c6a512-1295-4272-9138-f99709370657 --- uisimulator/{x11 => common}/mpegplay.c | 0 uisimulator/{x11 => common}/mpegplay.h | 0 uisimulator/play.c | 2 +- uisimulator/x11/Makefile | 3 +++ 4 files changed, 4 insertions(+), 1 deletion(-) rename uisimulator/{x11 => common}/mpegplay.c (100%) rename uisimulator/{x11 => common}/mpegplay.h (100%) diff --git a/uisimulator/x11/mpegplay.c b/uisimulator/common/mpegplay.c similarity index 100% rename from uisimulator/x11/mpegplay.c rename to uisimulator/common/mpegplay.c diff --git a/uisimulator/x11/mpegplay.h b/uisimulator/common/mpegplay.h similarity index 100% rename from uisimulator/x11/mpegplay.h rename to 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