diff options
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/win32/Makefile | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index f7b562c0b1..0399f383f2 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile | |||
@@ -21,6 +21,7 @@ APPDIR = ../../apps | |||
21 | RECDIR = $(APPDIR)/recorder | 21 | RECDIR = $(APPDIR)/recorder |
22 | PLAYDIR = $(APPDIR)/player | 22 | PLAYDIR = $(APPDIR)/player |
23 | PLUGINDIR = $(APPDIR)/plugins | 23 | PLUGINDIR = $(APPDIR)/plugins |
24 | SIMCOMMON = ../common | ||
24 | 25 | ||
25 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | 26 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) |
26 | MACHINEDIR = $(RECDIR) | 27 | MACHINEDIR = $(RECDIR) |
@@ -57,7 +58,7 @@ $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) $(RTC) | |||
57 | LDFLAGS = -lgdi32 -luser32 | 58 | LDFLAGS = -lgdi32 -luser32 |
58 | 59 | ||
59 | # Use this for simulator-only files | 60 | # Use this for simulator-only files |
60 | INCLUDES = -I. -I$(EXPORT) -I$(APPDIR) -I$(MACHINEDIR) -I../common -I$(MACHINEDIR) -I$(OBJDIR) | 61 | INCLUDES = -I. -I$(EXPORT) -I$(APPDIR) -I$(MACHINEDIR) -I$(SIMCOMMON) -I$(MACHINEDIR) -I$(OBJDIR) |
61 | 62 | ||
62 | # The true Rockbox Applications should use this include path: | 63 | # The true Rockbox Applications should use this include path: |
63 | APPINCLUDES = $(INCLUDES) | 64 | APPINCLUDES = $(INCLUDES) |
@@ -96,7 +97,7 @@ else | |||
96 | LCDSRSC = lcd-playersim.c lcd-player.c lcd-player-charset.c font-player.c | 97 | LCDSRSC = lcd-playersim.c lcd-player.c lcd-player-charset.c font-player.c |
97 | endif | 98 | endif |
98 | FIRMSRCS = $(LCDSRSC) id3.c mp3data.c usb.c mpeg.c powermgmt.c power.c \ | 99 | FIRMSRCS = $(LCDSRSC) id3.c mp3data.c usb.c mpeg.c powermgmt.c power.c \ |
99 | sprintf.c buffer.c | 100 | sprintf.c buffer.c lcd-common.c |
100 | 101 | ||
101 | APPS = main.c tree.c menu.c credits.c main_menu.c icons.c language.c \ | 102 | APPS = main.c tree.c menu.c credits.c main_menu.c icons.c language.c \ |
102 | playlist.c wps.c wps-display.c settings.c status.c \ | 103 | playlist.c wps.c wps-display.c settings.c status.c \ |
@@ -277,16 +278,19 @@ $(OBJDIR)/ctype.o: $(COMMON)/ctype.c | |||
277 | $(OBJDIR)/strtok.o: $(COMMON)/strtok.c | 278 | $(OBJDIR)/strtok.o: $(COMMON)/strtok.c |
278 | $(CC) $(CFLAGS) -c $< -o $@ | 279 | $(CC) $(CFLAGS) -c $< -o $@ |
279 | 280 | ||
280 | $(OBJDIR)/stubs.o: ../common/stubs.c | 281 | $(OBJDIR)/stubs.o: $(SIMCOMMON)/stubs.c |
281 | $(CC) $(CFLAGS) -c $< -o $@ | 282 | $(CC) $(CFLAGS) -c $< -o $@ |
282 | 283 | ||
283 | $(OBJDIR)/font-player.o: ../common/font-player.c | 284 | $(OBJDIR)/lcd-common.o: $(SIMCOMMON)/lcd-common.c |
284 | $(CC) $(CFLAGS) -c $< -o $@ | 285 | $(CC) $(CFLAGS) -c $< -o $@ |
285 | 286 | ||
286 | $(OBJDIR)/sim_icons.o: ../common/sim_icons.c | 287 | $(OBJDIR)/font-player.o: $(SIMCOMMON)/font-player.c |
287 | $(CC) $(CFLAGS) -c $< -o $@ | 288 | $(CC) $(CFLAGS) -c $< -o $@ |
288 | 289 | ||
289 | $(OBJDIR)/lcd-playersim.o: ../common/lcd-playersim.c | 290 | $(OBJDIR)/sim_icons.o: $(SIMCOMMON)/sim_icons.c |
291 | $(CC) $(CFLAGS) -c $< -o $@ | ||
292 | |||
293 | $(OBJDIR)/lcd-playersim.o: $(SIMCOMMON)/lcd-playersim.c | ||
290 | $(CC) $(CFLAGS) -c $< -o $@ | 294 | $(CC) $(CFLAGS) -c $< -o $@ |
291 | 295 | ||
292 | $(OBJDIR)/lcd-player.o: $(DRIVERS)/lcd-player.c | 296 | $(OBJDIR)/lcd-player.o: $(DRIVERS)/lcd-player.c |