summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-05-21 14:35:18 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-05-21 14:35:18 +0000
commitab2649fbef5ad41491f10be2666bb085dc174bff (patch)
tree01320efd7868e60b3f3644d5ef53088f2d52dda4 /uisimulator
parent6466b62e5d6c92c640a60dbbd73af7a368018149 (diff)
downloadrockbox-ab2649fbef5ad41491f10be2666bb085dc174bff.tar.gz
rockbox-ab2649fbef5ad41491f10be2666bb085dc174bff.zip
app.c removed, main_menu.c introduced
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@645 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r--uisimulator/x11/Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index 996ef6105d..60fad08d0e 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -43,7 +43,7 @@ $(KEYPAD) $(DISPLAY)
LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl
-INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(RECDIR)
+INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(RECDIR)
LIBS =
@@ -64,8 +64,11 @@ CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES)
FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c
-APPS = tetris.c screensaver.c tree.c app.c play.c menu.c icons.c bmp.c credits.c
+APPS = main.c tree.c play.c menu.c credits.c main_menu.c
+ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
+ APPS += tetris.c screensaver.c icons.c bmp.c
+endif
SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c \
button-x11.c io.c sleep.c $(APPS) $(FIRMSRCS)
@@ -132,6 +135,9 @@ credits.o: $(APPDIR)/credits.c
menu.o: $(APPDIR)/menu.c
$(CC) $(CFLAGS) -c $< -o $@
+main_menu.o: $(APPDIR)/main_menu.c
+ $(CC) $(CFLAGS) -c $< -o $@
+
icons.o: $(RECDIR)/icons.c
$(CC) $(CFLAGS) -c $< -o $@
@@ -141,7 +147,7 @@ tetris.o: $(RECDIR)/tetris.c
screensaver.o: $(RECDIR)/screensaver.c
$(CC) $(CFLAGS) -c $< -o $@
-app.o: $(APPDIR)/app.c
+main.o: $(APPDIR)/main.c
$(CC) $(CFLAGS) -c $< -o $@
bmp.o: $(RECDIR)/bmp.c