summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2002-05-17 12:23:11 +0000
committerDaniel Stenberg <daniel@haxx.se>2002-05-17 12:23:11 +0000
commited1726e056623f65cf839224385ae2f686d4ce6a (patch)
tree79518ac6988c0f78d9e704eef3dec9d33bf9006d /uisimulator
parent1f81380ce334a73dd36d8d97aa7ab1cde89efcac (diff)
downloadrockbox-ed1726e056623f65cf839224385ae2f686d4ce6a.tar.gz
rockbox-ed1726e056623f65cf839224385ae2f686d4ce6a.zip
made both recorder and player builds work again
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@616 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r--uisimulator/x11/Makefile18
1 files changed, 10 insertions, 8 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index 407f7b9847..f0edff4da6 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -19,28 +19,30 @@
TARGET = rockboxui
-APPDIR= ..
+APPDIR = ../../apps
+
+PREVAPPDIR= ..
FIRMWAREDIR = ../../firmware
DRIVERS = $(FIRMWAREDIR)/drivers
COMMON = $(FIRMWAREDIR)/common
-LIBMADDIR = $(APPDIR)/common/libmad
+LIBMADDIR = $(PREVAPPDIR)/common/libmad
CC = gcc
RM = rm -f
DEBUG = -g
-DISPLAY = -DHAVE_LCD_CHARCELLS
-#DISPLAY = -DHAVE_LCD_BITMAP
+#DISPLAY = -DHAVE_LCD_CHARCELLS
+DISPLAY = -DHAVE_LCD_BITMAP
-KEYPAD = -DHAVE_PLAYER_KEYPAD
-#KEYPAD = -DHAVE_RECORDER_KEYPAD
+#KEYPAD = -DHAVE_PLAYER_KEYPAD
+KEYPAD = -DHAVE_RECORDER_KEYPAD
DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \
$(KEYPAD) $(DISPLAY)
LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl
-INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR)
+INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR) -I$(APPDIR)
LIBS =
@@ -118,7 +120,7 @@ timer.o: $(LIBMADDIR)/timer.c
version.o: $(LIBMADDIR)/version.c
$(CC) $(CFLAGS) -c $< -o $@
-mpegplay.o: $(APPDIR)/common/mpegplay.c
+mpegplay.o: $(PREVAPPDIR)/common/mpegplay.c
$(CC) $(CFLAGS) -c $< -o $@
endif