uisimulator/sdl only contains bitmaps, rename to 'bitmaps'

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26139 a1c6a512-1295-4272-9138-f99709370657

56 files changed, 2 insertions, 2 deletions

diff --git a/uisimulator/sdl/UI-archosav300.bmp b/uisimulator/bitmaps/UI-archosav300.bmp
index e86221c..e86221c 100644
--- a/uisimulator/sdl/UI-archosav300.bmp
+++ b/uisimulator/bitmaps/UI-archosav300.bmp
diff --git a/uisimulator/sdl/UI-archosfmrecorder.bmp b/uisimulator/bitmaps/UI-archosfmrecorder.bmp
index 53f705b..53f705b 100644
--- a/uisimulator/sdl/UI-archosfmrecorder.bmp
+++ b/uisimulator/bitmaps/UI-archosfmrecorder.bmp
diff --git a/uisimulator/sdl/UI-archosondiofm.bmp b/uisimulator/bitmaps/UI-archosondiofm.bmp
index e258720..e258720 100644
--- a/uisimulator/sdl/UI-archosondiofm.bmp
+++ b/uisimulator/bitmaps/UI-archosondiofm.bmp
diff --git a/uisimulator/sdl/UI-archosondiosp.bmp b/uisimulator/bitmaps/UI-archosondiosp.bmp
index c62c233..c62c233 100644
--- a/uisimulator/sdl/UI-archosondiosp.bmp
+++ b/uisimulator/bitmaps/UI-archosondiosp.bmp
diff --git a/uisimulator/sdl/UI-archosplayer.bmp b/uisimulator/bitmaps/UI-archosplayer.bmp
index db4003b..db4003b 100644
--- a/uisimulator/sdl/UI-archosplayer.bmp
+++ b/uisimulator/bitmaps/UI-archosplayer.bmp
diff --git a/uisimulator/sdl/UI-archosrecorder.bmp b/uisimulator/bitmaps/UI-archosrecorder.bmp
index 98937fe..98937fe 100644
--- a/uisimulator/sdl/UI-archosrecorder.bmp
+++ b/uisimulator/bitmaps/UI-archosrecorder.bmp
diff --git a/uisimulator/sdl/UI-archosrecorderv2.bmp b/uisimulator/bitmaps/UI-archosrecorderv2.bmp
index 53f705b..53f705b 100644
--- a/uisimulator/sdl/UI-archosrecorderv2.bmp
+++ b/uisimulator/bitmaps/UI-archosrecorderv2.bmp
diff --git a/uisimulator/sdl/UI-cowond2.bmp b/uisimulator/bitmaps/UI-cowond2.bmp
index 187c73e..187c73e 100644
--- a/uisimulator/sdl/UI-cowond2.bmp
+++ b/uisimulator/bitmaps/UI-cowond2.bmp
diff --git a/uisimulator/sdl/UI-gigabeatfx.bmp b/uisimulator/bitmaps/UI-gigabeatfx.bmp
index 7d60aeb..7d60aeb 100644
--- a/uisimulator/sdl/UI-gigabeatfx.bmp
+++ b/uisimulator/bitmaps/UI-gigabeatfx.bmp
diff --git a/uisimulator/sdl/UI-gigabeats.bmp b/uisimulator/bitmaps/UI-gigabeats.bmp
index affdbda..affdbda 100644
--- a/uisimulator/sdl/UI-gigabeats.bmp
+++ b/uisimulator/bitmaps/UI-gigabeats.bmp
diff --git a/uisimulator/sdl/UI-gogearhdd1630.bmp b/uisimulator/bitmaps/UI-gogearhdd1630.bmp
index ac665cf..ac665cf 100644
--- a/uisimulator/sdl/UI-gogearhdd1630.bmp
+++ b/uisimulator/bitmaps/UI-gogearhdd1630.bmp
diff --git a/uisimulator/sdl/UI-gogearsa9200.bmp b/uisimulator/bitmaps/UI-gogearsa9200.bmp
index b801640..b801640 100644
--- a/uisimulator/sdl/UI-gogearsa9200.bmp
+++ b/uisimulator/bitmaps/UI-gogearsa9200.bmp
diff --git a/uisimulator/sdl/UI-iaudio7.bmp b/uisimulator/bitmaps/UI-iaudio7.bmp
index c349477..c349477 100644
--- a/uisimulator/sdl/UI-iaudio7.bmp
+++ b/uisimulator/bitmaps/UI-iaudio7.bmp
diff --git a/uisimulator/sdl/UI-iaudiom3.bmp b/uisimulator/bitmaps/UI-iaudiom3.bmp
index add298c..add298c 100644
--- a/uisimulator/sdl/UI-iaudiom3.bmp
+++ b/uisimulator/bitmaps/UI-iaudiom3.bmp
diff --git a/uisimulator/sdl/UI-iaudiom5.bmp b/uisimulator/bitmaps/UI-iaudiom5.bmp
index b2d4d06..b2d4d06 100644
--- a/uisimulator/sdl/UI-iaudiom5.bmp
+++ b/uisimulator/bitmaps/UI-iaudiom5.bmp
diff --git a/uisimulator/sdl/UI-iaudiox5.bmp b/uisimulator/bitmaps/UI-iaudiox5.bmp
index 18bdf9a..18bdf9a 100644
--- a/uisimulator/sdl/UI-iaudiox5.bmp
+++ b/uisimulator/bitmaps/UI-iaudiox5.bmp
diff --git a/uisimulator/sdl/UI-ipod1g2g.bmp b/uisimulator/bitmaps/UI-ipod1g2g.bmp
index 2e28dba..2e28dba 100644
--- a/uisimulator/sdl/UI-ipod1g2g.bmp
+++ b/uisimulator/bitmaps/UI-ipod1g2g.bmp
diff --git a/uisimulator/sdl/UI-ipod3g.bmp b/uisimulator/bitmaps/UI-ipod3g.bmp
index e8a0b95..e8a0b95 100644
--- a/uisimulator/sdl/UI-ipod3g.bmp
+++ b/uisimulator/bitmaps/UI-ipod3g.bmp
diff --git a/uisimulator/sdl/UI-ipod4g.bmp b/uisimulator/bitmaps/UI-ipod4g.bmp
index b6f7cd9..b6f7cd9 100644
--- a/uisimulator/sdl/UI-ipod4g.bmp
+++ b/uisimulator/bitmaps/UI-ipod4g.bmp
diff --git a/uisimulator/sdl/UI-ipodcolor.bmp b/uisimulator/bitmaps/UI-ipodcolor.bmp
index a32fc8e..a32fc8e 100644
--- a/uisimulator/sdl/UI-ipodcolor.bmp
+++ b/uisimulator/bitmaps/UI-ipodcolor.bmp
diff --git a/uisimulator/sdl/UI-ipodmini1g.bmp b/uisimulator/bitmaps/UI-ipodmini1g.bmp
index 63b69d5..63b69d5 100644
--- a/uisimulator/sdl/UI-ipodmini1g.bmp
+++ b/uisimulator/bitmaps/UI-ipodmini1g.bmp
diff --git a/uisimulator/sdl/UI-ipodmini2g.bmp b/uisimulator/bitmaps/UI-ipodmini2g.bmp
index 63b69d5..63b69d5 100644
--- a/uisimulator/sdl/UI-ipodmini2g.bmp
+++ b/uisimulator/bitmaps/UI-ipodmini2g.bmp
diff --git a/uisimulator/sdl/UI-ipodnano1g.bmp b/uisimulator/bitmaps/UI-ipodnano1g.bmp
index 8abbb16..8abbb16 100644
--- a/uisimulator/sdl/UI-ipodnano1g.bmp
+++ b/uisimulator/bitmaps/UI-ipodnano1g.bmp
diff --git a/uisimulator/sdl/UI-ipodnano2g.bmp b/uisimulator/bitmaps/UI-ipodnano2g.bmp
index 5956c04..5956c04 100644
--- a/uisimulator/sdl/UI-ipodnano2g.bmp
+++ b/uisimulator/bitmaps/UI-ipodnano2g.bmp
diff --git a/uisimulator/sdl/UI-ipodvideo.bmp b/uisimulator/bitmaps/UI-ipodvideo.bmp
index e490449..e490449 100644
--- a/uisimulator/sdl/UI-ipodvideo.bmp
+++ b/uisimulator/bitmaps/UI-ipodvideo.bmp
diff --git a/uisimulator/sdl/UI-iriverh10.bmp b/uisimulator/bitmaps/UI-iriverh10.bmp
index 1a3b91d..1a3b91d 100644
--- a/uisimulator/sdl/UI-iriverh10.bmp
+++ b/uisimulator/bitmaps/UI-iriverh10.bmp
diff --git a/uisimulator/sdl/UI-iriverh100.bmp b/uisimulator/bitmaps/UI-iriverh100.bmp
index caeb81b..caeb81b 100644
--- a/uisimulator/sdl/UI-iriverh100.bmp
+++ b/uisimulator/bitmaps/UI-iriverh100.bmp
diff --git a/uisimulator/sdl/UI-iriverh10_5gb.bmp b/uisimulator/bitmaps/UI-iriverh10_5gb.bmp
index 03542d8..03542d8 100644
--- a/uisimulator/sdl/UI-iriverh10_5gb.bmp
+++ b/uisimulator/bitmaps/UI-iriverh10_5gb.bmp
diff --git a/uisimulator/sdl/UI-iriverh120.bmp b/uisimulator/bitmaps/UI-iriverh120.bmp
index caeb81b..caeb81b 100644
--- a/uisimulator/sdl/UI-iriverh120.bmp
+++ b/uisimulator/bitmaps/UI-iriverh120.bmp
diff --git a/uisimulator/sdl/UI-iriverh300.bmp b/uisimulator/bitmaps/UI-iriverh300.bmp
index 5f099b7..5f099b7 100644
--- a/uisimulator/sdl/UI-iriverh300.bmp
+++ b/uisimulator/bitmaps/UI-iriverh300.bmp
diff --git a/uisimulator/sdl/UI-iriverifp7xx.bmp b/uisimulator/bitmaps/UI-iriverifp7xx.bmp
index 95424ac..95424ac 100644
--- a/uisimulator/sdl/UI-iriverifp7xx.bmp
+++ b/uisimulator/bitmaps/UI-iriverifp7xx.bmp
diff --git a/uisimulator/sdl/UI-mini2440.bmp b/uisimulator/bitmaps/UI-mini2440.bmp
index 556026a..556026a 100644
--- a/uisimulator/sdl/UI-mini2440.bmp
+++ b/uisimulator/bitmaps/UI-mini2440.bmp
diff --git a/uisimulator/sdl/UI-mpiohd200.bmp b/uisimulator/bitmaps/UI-mpiohd200.bmp
index 30a38c8..30a38c8 100644
--- a/uisimulator/sdl/UI-mpiohd200.bmp
+++ b/uisimulator/bitmaps/UI-mpiohd200.bmp
diff --git a/uisimulator/sdl/UI-mrobe100.bmp b/uisimulator/bitmaps/UI-mrobe100.bmp
index 2a9df60..2a9df60 100644
--- a/uisimulator/sdl/UI-mrobe100.bmp
+++ b/uisimulator/bitmaps/UI-mrobe100.bmp
diff --git a/uisimulator/sdl/UI-mrobe500.bmp b/uisimulator/bitmaps/UI-mrobe500.bmp
index 2d47aa6..2d47aa6 100644
--- a/uisimulator/sdl/UI-mrobe500.bmp
+++ b/uisimulator/bitmaps/UI-mrobe500.bmp
diff --git a/uisimulator/sdl/UI-ondavx747.bmp b/uisimulator/bitmaps/UI-ondavx747.bmp
index 364003d..364003d 100644
--- a/uisimulator/sdl/UI-ondavx747.bmp
+++ b/uisimulator/bitmaps/UI-ondavx747.bmp
diff --git a/uisimulator/sdl/UI-ondavx747p.bmp b/uisimulator/bitmaps/UI-ondavx747p.bmp
index 364003d..364003d 100644
--- a/uisimulator/sdl/UI-ondavx747p.bmp
+++ b/uisimulator/bitmaps/UI-ondavx747p.bmp
diff --git a/uisimulator/sdl/UI-ondavx777.bmp b/uisimulator/bitmaps/UI-ondavx777.bmp
index 1f7617e..1f7617e 100644
--- a/uisimulator/sdl/UI-ondavx777.bmp
+++ b/uisimulator/bitmaps/UI-ondavx777.bmp
diff --git a/uisimulator/sdl/UI-samsungyh820.bmp b/uisimulator/bitmaps/UI-samsungyh820.bmp
index b74aedb..b74aedb 100644
--- a/uisimulator/sdl/UI-samsungyh820.bmp
+++ b/uisimulator/bitmaps/UI-samsungyh820.bmp
diff --git a/uisimulator/sdl/UI-samsungyh920.bmp b/uisimulator/bitmaps/UI-samsungyh920.bmp
index 6d330d4..6d330d4 100644
--- a/uisimulator/sdl/UI-samsungyh920.bmp
+++ b/uisimulator/bitmaps/UI-samsungyh920.bmp
diff --git a/uisimulator/sdl/UI-samsungyh925.bmp b/uisimulator/bitmaps/UI-samsungyh925.bmp
index 6d330d4..6d330d4 100644
--- a/uisimulator/sdl/UI-samsungyh925.bmp
+++ b/uisimulator/bitmaps/UI-samsungyh925.bmp
diff --git a/uisimulator/sdl/UI-sansac200.bmp b/uisimulator/bitmaps/UI-sansac200.bmp
index d4b1692..d4b1692 100644
--- a/uisimulator/sdl/UI-sansac200.bmp
+++ b/uisimulator/bitmaps/UI-sansac200.bmp
diff --git a/uisimulator/sdl/UI-sansac200v2.bmp b/uisimulator/bitmaps/UI-sansac200v2.bmp
index d4b1692..d4b1692 100644
--- a/uisimulator/sdl/UI-sansac200v2.bmp
+++ b/uisimulator/bitmaps/UI-sansac200v2.bmp
diff --git a/uisimulator/sdl/UI-sansaclip.bmp b/uisimulator/bitmaps/UI-sansaclip.bmp
index 597f3f9..597f3f9 100644
--- a/uisimulator/sdl/UI-sansaclip.bmp
+++ b/uisimulator/bitmaps/UI-sansaclip.bmp
diff --git a/uisimulator/sdl/UI-sansaclipplus.bmp b/uisimulator/bitmaps/UI-sansaclipplus.bmp
index b644391..b644391 100644
--- a/uisimulator/sdl/UI-sansaclipplus.bmp
+++ b/uisimulator/bitmaps/UI-sansaclipplus.bmp
diff --git a/uisimulator/sdl/UI-sansaclipv2.bmp b/uisimulator/bitmaps/UI-sansaclipv2.bmp
index 597f3f9..597f3f9 100644
--- a/uisimulator/sdl/UI-sansaclipv2.bmp
+++ b/uisimulator/bitmaps/UI-sansaclipv2.bmp
diff --git a/uisimulator/sdl/UI-sansae200.bmp b/uisimulator/bitmaps/UI-sansae200.bmp
index 4b6d4f5..4b6d4f5 100644
--- a/uisimulator/sdl/UI-sansae200.bmp
+++ b/uisimulator/bitmaps/UI-sansae200.bmp
diff --git a/uisimulator/sdl/UI-sansae200v2.bmp b/uisimulator/bitmaps/UI-sansae200v2.bmp
index 4b6d4f5..4b6d4f5 100644
--- a/uisimulator/sdl/UI-sansae200v2.bmp
+++ b/uisimulator/bitmaps/UI-sansae200v2.bmp
diff --git a/uisimulator/sdl/UI-sansafuze.bmp b/uisimulator/bitmaps/UI-sansafuze.bmp
index 02b07b6..02b07b6 100644
--- a/uisimulator/sdl/UI-sansafuze.bmp
+++ b/uisimulator/bitmaps/UI-sansafuze.bmp
diff --git a/uisimulator/sdl/UI-sansafuzev2.bmp b/uisimulator/bitmaps/UI-sansafuzev2.bmp
index 02b07b6..02b07b6 100644
--- a/uisimulator/sdl/UI-sansafuzev2.bmp
+++ b/uisimulator/bitmaps/UI-sansafuzev2.bmp
diff --git a/uisimulator/sdl/UI-sansam200v4.bmp b/uisimulator/bitmaps/UI-sansam200v4.bmp
index 6461b3e..6461b3e 100644
--- a/uisimulator/sdl/UI-sansam200v4.bmp
+++ b/uisimulator/bitmaps/UI-sansam200v4.bmp
diff --git a/uisimulator/sdl/UI-vibe500.bmp b/uisimulator/bitmaps/UI-vibe500.bmp
index 8c12aa5..8c12aa5 100644
--- a/uisimulator/sdl/UI-vibe500.bmp
+++ b/uisimulator/bitmaps/UI-vibe500.bmp
diff --git a/uisimulator/sdl/UI-zenvision.bmp b/uisimulator/bitmaps/UI-zenvision.bmp
index 4d82b18..4d82b18 100644
--- a/uisimulator/sdl/UI-zenvision.bmp
+++ b/uisimulator/bitmaps/UI-zenvision.bmp
diff --git a/uisimulator/sdl/UI-zenvisionm30gb.bmp b/uisimulator/bitmaps/UI-zenvisionm30gb.bmp
index d244b8d..d244b8d 100644
--- a/uisimulator/sdl/UI-zenvisionm30gb.bmp
+++ b/uisimulator/bitmaps/UI-zenvisionm30gb.bmp
diff --git a/uisimulator/sdl/UI-zenvisionm60gb.bmp b/uisimulator/bitmaps/UI-zenvisionm60gb.bmp
index d244b8d..d244b8d 100644
--- a/uisimulator/sdl/UI-zenvisionm60gb.bmp
+++ b/uisimulator/bitmaps/UI-zenvisionm60gb.bmp
diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make
index 86fcb2a..2e6e75f 100644
--- a/uisimulator/uisimulator.make
+++ b/uisimulator/uisimulator.make
@@ -7,7 +7,7 @@
 # $Id$
 #
 
-INCLUDES += -I$(ROOTDIR)/uisimulator/sdl -I$(ROOTDIR)/uisimulator/common \
+INCLUDES += -I$(ROOTDIR)/uisimulator/bitmaps -I$(ROOTDIR)/uisimulator/common \
 	-I$(FIRMDIR)/include -I$(FIRMDIR)/export $(TARGET_INC) -I$(BUILDDIR) -I$(APPSDIR)
 
 SIMFLAGS += $(INCLUDES) $(DEFINES) -DHAVE_CONFIG_H $(GCCOPTS)
@@ -33,5 +33,5 @@ $(BUILDDIR)/uisimulator/%.o: $(ROOTDIR)/uisimulator/%.c
 	$(SILENT)mkdir -p $(dir $@)
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SIMFLAGS) -c $< -o $@
 
-$(UIBMP): $(ROOTDIR)/uisimulator/sdl/UI-$(MODELNAME).bmp
+$(UIBMP): $(ROOTDIR)/uisimulator/bitmaps/UI-$(MODELNAME).bmp
 	$(call PRINTS,CP $(@F))cp $< $@