diff options
-rw-r--r-- | uisimulator/x11/Makefile | 18 |
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 @@ | |||
19 | 19 | ||
20 | TARGET = rockboxui | 20 | TARGET = rockboxui |
21 | 21 | ||
22 | APPDIR= .. | 22 | APPDIR = ../../apps |
23 | |||
24 | PREVAPPDIR= .. | ||
23 | FIRMWAREDIR = ../../firmware | 25 | FIRMWAREDIR = ../../firmware |
24 | DRIVERS = $(FIRMWAREDIR)/drivers | 26 | DRIVERS = $(FIRMWAREDIR)/drivers |
25 | COMMON = $(FIRMWAREDIR)/common | 27 | COMMON = $(FIRMWAREDIR)/common |
26 | LIBMADDIR = $(APPDIR)/common/libmad | 28 | LIBMADDIR = $(PREVAPPDIR)/common/libmad |
27 | 29 | ||
28 | CC = gcc | 30 | CC = gcc |
29 | RM = rm -f | 31 | RM = rm -f |
30 | DEBUG = -g | 32 | DEBUG = -g |
31 | 33 | ||
32 | DISPLAY = -DHAVE_LCD_CHARCELLS | 34 | #DISPLAY = -DHAVE_LCD_CHARCELLS |
33 | #DISPLAY = -DHAVE_LCD_BITMAP | 35 | DISPLAY = -DHAVE_LCD_BITMAP |
34 | 36 | ||
35 | KEYPAD = -DHAVE_PLAYER_KEYPAD | 37 | #KEYPAD = -DHAVE_PLAYER_KEYPAD |
36 | #KEYPAD = -DHAVE_RECORDER_KEYPAD | 38 | KEYPAD = -DHAVE_RECORDER_KEYPAD |
37 | 39 | ||
38 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 40 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
39 | $(KEYPAD) $(DISPLAY) | 41 | $(KEYPAD) $(DISPLAY) |
40 | 42 | ||
41 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl | 43 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl |
42 | 44 | ||
43 | INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR) | 45 | INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR) -I$(APPDIR) |
44 | 46 | ||
45 | LIBS = | 47 | LIBS = |
46 | 48 | ||
@@ -118,7 +120,7 @@ timer.o: $(LIBMADDIR)/timer.c | |||
118 | version.o: $(LIBMADDIR)/version.c | 120 | version.o: $(LIBMADDIR)/version.c |
119 | $(CC) $(CFLAGS) -c $< -o $@ | 121 | $(CC) $(CFLAGS) -c $< -o $@ |
120 | 122 | ||
121 | mpegplay.o: $(APPDIR)/common/mpegplay.c | 123 | mpegplay.o: $(PREVAPPDIR)/common/mpegplay.c |
122 | $(CC) $(CFLAGS) -c $< -o $@ | 124 | $(CC) $(CFLAGS) -c $< -o $@ |
123 | 125 | ||
124 | endif | 126 | endif |