summaryrefslogtreecommitdiff
path: root/uisimulator/x11/Makefile
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2002-06-30 14:37:40 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2002-06-30 14:37:40 +0000
commitadbce88570d9d4bb740b6ac82842c8b2af0adfe0 (patch)
tree62dcc77254464a1ccc972dd88b32b37ee5b72a72 /uisimulator/x11/Makefile
parentcb30e5422fec01cca2377cd8179d76a272707664 (diff)
Now uses firmware/mpeg.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1269 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/x11/Makefile')
-rw-r--r--uisimulator/x11/Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index f6b22e243d..73d46bf9a4 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -73,7 +73,7 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall
APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall
-FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c
+FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c usb.c mpeg.c
APPS = main.c tree.c menu.c credits.c main_menu.c\
playlist.c showtext.c wps.c settings.c
@@ -84,7 +84,7 @@ ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
APPS += tetris.c sokoban.c bounce.c boxes.c icons.c bmp.c
endif
-SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c mpeg.c \
+SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c \
button-x11.c io.c thread.c $(APPS) $(MENUS) $(FIRMSRCS)
ifdef MPEG_PLAY
@@ -212,9 +212,15 @@ $(OBJDIR)/id3.o: $(FIRMWAREDIR)/id3.c
$(OBJDIR)/debug.o: $(FIRMWAREDIR)/debug.c
$(CC) $(CFLAGS) -c $< -o $@
+$(OBJDIR)/mpeg.o: $(FIRMWAREDIR)/mpeg.c
+ $(CC) $(CFLAGS) -c $< -o $@
+
$(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c
$(CC) $(APPCFLAGS) -c $< -o $@
+$(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c
+ $(CC) $(APPCFLAGS) -c $< -o $@
+
# these ones are simulator-specific