From daaec5df2f1b15baaac34fad4254c984ed7edda3 Mon Sep 17 00:00:00 2001
From: Jörg Hohensohn <hohensoh@rockbox.org>
Date: Mon, 5 Jan 2004 23:42:56 +0000
Subject: still trying to fix the sim (blindfolded)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4195 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/mp3_playback.c    | 4 ++++
 uisimulator/win32/Makefile | 7 +++++--
 uisimulator/x11/Makefile   | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/firmware/mp3_playback.c b/firmware/mp3_playback.c
index 9ded720248..0d9a7a69fd 100644
--- a/firmware/mp3_playback.c
+++ b/firmware/mp3_playback.c
@@ -898,6 +898,8 @@ void mp3_init(int volume, int bass, int treble, int balance, int loudness,
 
 /* new functions, to be exported to plugin API */
 
+#ifndef SIMULATOR
+
 void mp3_play_init(void)
 {
 #ifdef HAVE_MAS3587F
@@ -937,3 +939,5 @@ void mp3_play_stop(void)
     mp3_play_pause(false);
     CHCR3 &= ~0x0001; /* Disable the DMA interrupt */
 }
+
+#endif /* #ifndef SIMULATOR */
\ No newline at end of file
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile
index 76dd1c9af2..69e6e0b734 100644
--- a/uisimulator/win32/Makefile
+++ b/uisimulator/win32/Makefile
@@ -96,8 +96,8 @@ ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
 else
 	LCDSRSC = lcd-playersim.c lcd-player.c lcd-player-charset.c font-player.c
 endif
-FIRMSRCS = $(LCDSRSC) id3.c mp3data.c usb.c mpeg.c powermgmt.c power.c \
-	sprintf.c buffer.c lcd-common.c strtok.c random.c
+FIRMSRCS = $(LCDSRSC) id3.c mp3data.c usb.c mpeg.c mp3_playback.c \
+	powermgmt.c power.c sprintf.c buffer.c lcd-common.c strtok.c random.c
 
 APPS = main.c tree.c menu.c credits.c main_menu.c icons.c language.c \
 	playlist.c wps.c wps-display.c settings.c status.c \
@@ -266,6 +266,9 @@ $(OBJDIR)/debug.o: $(FIRMWAREDIR)/debug.c
 $(OBJDIR)/mpeg.o: $(FIRMWAREDIR)/mpeg.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
+$(OBJDIR)/mp3_playback.o: $(FIRMWAREDIR)/mp3_playback.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
 $(OBJDIR)/buffer.o: $(FIRMWAREDIR)/buffer.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index 38e5e624ba..092b68e510 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -246,7 +246,7 @@ $(OBJDIR)/panic.o: $(FIRMWAREDIR)/panic.c
 $(OBJDIR)/mpeg.o: $(FIRMWAREDIR)/mpeg.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
-$(OBJDIR)/mpeg.o: $(FIRMWAREDIR)/mp3_playback.c
+$(OBJDIR)/mp3_playback.o: $(FIRMWAREDIR)/mp3_playback.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
 $(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c
-- 
cgit v1.2.3