summaryrefslogtreecommitdiffstats
path: root/uisimulator
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2003-12-15 10:33:53 +0000
committerDaniel Stenberg <daniel@haxx.se>2003-12-15 10:33:53 +0000
commit26c079c233fdef58fd966a314bb5fee38909d697 (patch)
treee346ea28c9ec71104505085ea0176b9bd56e7d52 /uisimulator
parent31044ce00747aa16156ae75b1b54a17e0f490bdc (diff)
downloadrockbox-26c079c233fdef58fd966a314bb5fee38909d697.tar.gz
rockbox-26c079c233fdef58fd966a314bb5fee38909d697.tar.bz2
rockbox-26c079c233fdef58fd966a314bb5fee38909d697.zip
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
Diffstat (limited to 'uisimulator')
-rw-r--r--uisimulator/win32/Makefile16
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
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