From 26c079c233fdef58fd966a314bb5fee38909d697 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 15 Dec 2003 10:33:53 +0000 Subject: added the lcd-common.c to the build, which fixes the lcd_blit build problem git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4150 a1c6a512-1295-4272-9138-f99709370657 --- uisimulator/win32/Makefile | 16 ++++++++++------ 1 file 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 RECDIR = $(APPDIR)/recorder PLAYDIR = $(APPDIR)/player PLUGINDIR = $(APPDIR)/plugins +SIMCOMMON = ../common ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) MACHINEDIR = $(RECDIR) @@ -57,7 +58,7 @@ $(KEYPAD) $(DISPLAY) -DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) $(RTC) LDFLAGS = -lgdi32 -luser32 # Use this for simulator-only files -INCLUDES = -I. -I$(EXPORT) -I$(APPDIR) -I$(MACHINEDIR) -I../common -I$(MACHINEDIR) -I$(OBJDIR) +INCLUDES = -I. -I$(EXPORT) -I$(APPDIR) -I$(MACHINEDIR) -I$(SIMCOMMON) -I$(MACHINEDIR) -I$(OBJDIR) # The true Rockbox Applications should use this include path: APPINCLUDES = $(INCLUDES) @@ -96,7 +97,7 @@ else LCDSRSC = lcd-playersim.c lcd-player.c lcd-player-charset.c font-player.c endif FIRMSRCS = $(LCDSRSC) id3.c mp3data.c usb.c mpeg.c powermgmt.c power.c \ - sprintf.c buffer.c + sprintf.c buffer.c lcd-common.c APPS = main.c tree.c menu.c credits.c main_menu.c icons.c language.c \ playlist.c wps.c wps-display.c settings.c status.c \ @@ -277,16 +278,19 @@ $(OBJDIR)/ctype.o: $(COMMON)/ctype.c $(OBJDIR)/strtok.o: $(COMMON)/strtok.c $(CC) $(CFLAGS) -c $< -o $@ -$(OBJDIR)/stubs.o: ../common/stubs.c +$(OBJDIR)/stubs.o: $(SIMCOMMON)/stubs.c $(CC) $(CFLAGS) -c $< -o $@ -$(OBJDIR)/font-player.o: ../common/font-player.c +$(OBJDIR)/lcd-common.o: $(SIMCOMMON)/lcd-common.c $(CC) $(CFLAGS) -c $< -o $@ -$(OBJDIR)/sim_icons.o: ../common/sim_icons.c +$(OBJDIR)/font-player.o: $(SIMCOMMON)/font-player.c $(CC) $(CFLAGS) -c $< -o $@ -$(OBJDIR)/lcd-playersim.o: ../common/lcd-playersim.c +$(OBJDIR)/sim_icons.o: $(SIMCOMMON)/sim_icons.c + $(CC) $(CFLAGS) -c $< -o $@ + +$(OBJDIR)/lcd-playersim.o: $(SIMCOMMON)/lcd-playersim.c $(CC) $(CFLAGS) -c $< -o $@ $(OBJDIR)/lcd-player.o: $(DRIVERS)/lcd-player.c -- cgit v1.2.3