diff options
Diffstat (limited to 'uisimulator/x11/Makefile')
-rw-r--r-- | uisimulator/x11/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 5fc83bfcaa..392e4c3595 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -32,7 +32,6 @@ endif | |||
32 | PREVAPPDIR= .. | 32 | PREVAPPDIR= .. |
33 | FIRMWAREDIR = ../../firmware | 33 | FIRMWAREDIR = ../../firmware |
34 | DRIVERS = $(FIRMWAREDIR)/drivers | 34 | DRIVERS = $(FIRMWAREDIR)/drivers |
35 | COMMON = $(FIRMWAREDIR)/common | ||
36 | LIBMADDIR = $(PREVAPPDIR)/common/libmad | 35 | LIBMADDIR = $(PREVAPPDIR)/common/libmad |
37 | TOOLSDIR = ../../tools | 36 | TOOLSDIR = ../../tools |
38 | DOCSDIR = ../../docs | 37 | DOCSDIR = ../../docs |
@@ -53,11 +52,12 @@ $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) $(RTC) | |||
53 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl | 52 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl |
54 | 53 | ||
55 | # Use this for simulator-only files | 54 | # Use this for simulator-only files |
56 | INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(MACHINEDIR) -I../common -I$(OBJDIR) | 55 | INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR)/export -I$(APPDIR) \ |
57 | SRCDIRS = . $(DRIVERS) $(COMMON) $(FIRMWAREDIR) $(APPDIR) $(MACHINEDIR) | 56 | -I$(MACHINEDIR) -I../common -I$(OBJDIR) |
57 | SRCDIRS = . $(DRIVERS) $(FIRMWAREDIR)/export $(APPDIR) $(MACHINEDIR) | ||
58 | 58 | ||
59 | # The true Rockbox Applications should use this include path: | 59 | # The true Rockbox Applications should use this include path: |
60 | APPINCLUDES = -I$(FIRMWAREDIR)/include $(INCLUDES) | 60 | APPINCLUDES = $(INCLUDES) |
61 | 61 | ||
62 | LIBS = -lpthread | 62 | LIBS = -lpthread |
63 | 63 | ||
@@ -85,8 +85,8 @@ ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | |||
85 | else | 85 | else |
86 | LCDSRSC = lcd-playersim.c lcd-player.c font-player.c lcd-player-charset.c | 86 | LCDSRSC = lcd-playersim.c lcd-player.c font-player.c lcd-player-charset.c |
87 | endif | 87 | endif |
88 | FIRMSRCS = $(LCDSRSC) sprintf.c id3.c debug.c usb.c mpeg.c power.c\ | 88 | FIRMSRCS = $(LCDSRSC) id3.c debug.c usb.c mpeg.c power.c\ |
89 | powermgmt.c panic.c ctype.c | 89 | powermgmt.c panic.c |
90 | 90 | ||
91 | APPS = main.c tree.c menu.c credits.c main_menu.c language.c\ | 91 | APPS = main.c tree.c menu.c credits.c main_menu.c language.c\ |
92 | playlist.c wps.c wps-display.c settings.c status.c icons.c\ | 92 | playlist.c wps.c wps-display.c settings.c status.c icons.c\ |
@@ -284,7 +284,7 @@ $(OBJDIR)/ctype.o: $(COMMON)/ctype.c | |||
284 | $(CC) $(CFLAGS) $(APPINCLUDES) -c $< -o $@ | 284 | $(CC) $(CFLAGS) $(APPINCLUDES) -c $< -o $@ |
285 | 285 | ||
286 | $(OBJDIR)/stubs.o: ../common/stubs.c | 286 | $(OBJDIR)/stubs.o: ../common/stubs.c |
287 | $(CC) $(CFLAGS) -c $< -o $@ | 287 | $(CC) $(APPCFLAGS) -c $< -o $@ |
288 | 288 | ||
289 | $(OBJDIR)/sim_icons.o: ../common/sim_icons.c | 289 | $(OBJDIR)/sim_icons.o: ../common/sim_icons.c |
290 | $(CC) $(CFLAGS) -c $< -o $@ | 290 | $(CC) $(CFLAGS) -c $< -o $@ |