summaryrefslogtreecommitdiff
path: root/uisimulator
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-01-17 21:18:21 +0000
committerJens Arnold <amiconn@rockbox.org>2005-01-17 21:18:21 +0000
commit57c129f34d06367fe1b1088a321a7f65332db382 (patch)
treeb77af568f5286ce5015a5eea5bc798d785d03f82 /uisimulator
parentb3303d70224adc28a982fd6b9ba729b7f0934f41 (diff)
downloadrockbox-57c129f34d06367fe1b1088a321a7f65332db382.tar.gz
rockbox-57c129f34d06367fe1b1088a321a7f65332db382.zip
Use the correct lcd code for iRiver simulator builds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5589 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r--uisimulator/win32/Makefile5
-rw-r--r--uisimulator/x11/Makefile5
2 files changed, 10 insertions, 0 deletions
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile
index d97845e6f4..69e4281601 100644
--- a/uisimulator/win32/Makefile
+++ b/uisimulator/win32/Makefile
@@ -24,6 +24,7 @@ PLUGINDIR = $(APPDIR)/plugins
24SIMCOMMON = ../common 24SIMCOMMON = ../common
25 25
26ISONDIO := $(findstring ONDIO, $(TARGET)) 26ISONDIO := $(findstring ONDIO, $(TARGET))
27ISIRIVER := $(findstring IRIVER, $(TARGET))
27ISPLAYER := $(findstring PLAYER, $(TARGET)) 28ISPLAYER := $(findstring PLAYER, $(TARGET))
28ifeq ($(ISPLAYER), PLAYER) 29ifeq ($(ISPLAYER), PLAYER)
29 MACHINEDIR = $(PLAYDIR) 30 MACHINEDIR = $(PLAYDIR)
@@ -99,8 +100,12 @@ endif
99ifeq ($(ISPLAYER),PLAYER) 100ifeq ($(ISPLAYER),PLAYER)
100 LCDSRSC = lcd-playersim.c lcd-player.c lcd-player-charset.c font-player.c 101 LCDSRSC = lcd-playersim.c lcd-player.c lcd-player-charset.c font-player.c
101else 102else
103ifeq ($(ISIRIVER),IRIVER)
104 LCDSRSC = lcd-h100.c sysfont.c font.c
105else
102 LCDSRSC = lcd-recorder.c sysfont.c font.c 106 LCDSRSC = lcd-recorder.c sysfont.c font.c
103endif 107endif
108endif
104COMMONSRCS = io.c stubs.c lcd-common.c sim_icons.c fmradio.c 109COMMONSRCS = io.c stubs.c lcd-common.c sim_icons.c fmradio.c
105 110
106FIRMSRCS = $(LCDSRSC) id3.c mp3data.c usb.c mpeg.c mp3_playback.c \ 111FIRMSRCS = $(LCDSRSC) id3.c mp3data.c usb.c mpeg.c mp3_playback.c \
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index 8feb292a20..9b9afe3618 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -23,6 +23,7 @@ PLUGINDIR = $(APPSDIR)/plugins
23SIMCOMMON = ../common 23SIMCOMMON = ../common
24 24
25ISONDIO := $(findstring ONDIO, $(TARGET)) 25ISONDIO := $(findstring ONDIO, $(TARGET))
26ISIRIVER := $(findstring IRIVER, $(TARGET))
26ISPLAYER := $(findstring PLAYER, $(TARGET)) 27ISPLAYER := $(findstring PLAYER, $(TARGET))
27ifeq ($(ISPLAYER), PLAYER) 28ifeq ($(ISPLAYER), PLAYER)
28 MACHINEDIR = $(PLAYDIR) 29 MACHINEDIR = $(PLAYDIR)
@@ -111,8 +112,12 @@ endif
111ifeq ($(ISPLAYER), PLAYER) 112ifeq ($(ISPLAYER), PLAYER)
112 LCDSRSC = lcd-playersim.c lcd-player.c lcd-player-charset.c font-player.c 113 LCDSRSC = lcd-playersim.c lcd-player.c lcd-player-charset.c font-player.c
113else 114else
115ifeq ($(ISIRIVER),IRIVER)
116 LCDSRSC = lcd-h100.c sysfont.c font.c
117else
114 LCDSRSC = lcd-recorder.c sysfont.c font.c 118 LCDSRSC = lcd-recorder.c sysfont.c font.c
115endif 119endif
120endif
116COMMONSRCS = io.c stubs.c lcd-common.c sim_icons.c fmradio.c 121COMMONSRCS = io.c stubs.c lcd-common.c sim_icons.c fmradio.c
117 122
118FIRMSRCS = $(LCDSRSC) id3.c mp3data.c usb.c mpeg.c mp3_playback.c \ 123FIRMSRCS = $(LCDSRSC) id3.c mp3data.c usb.c mpeg.c mp3_playback.c \