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 e86221ca7e..e86221ca7e 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 53f705b9ef..53f705b9ef 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 e258720d28..e258720d28 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 c62c2334a3..c62c2334a3 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 db4003b120..db4003b120 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 98937fea2d..98937fea2d 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 53f705b9ef..53f705b9ef 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 187c73e9a1..187c73e9a1 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 7d60aebe8a..7d60aebe8a 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 affdbdaf69..affdbdaf69 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 ac665cf96d..ac665cf96d 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 b801640988..b801640988 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 c349477747..c349477747 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 add298cc89..add298cc89 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 b2d4d0620e..b2d4d0620e 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 18bdf9a512..18bdf9a512 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 2e28dbaa80..2e28dbaa80 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 e8a0b956ba..e8a0b956ba 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 b6f7cd94e0..b6f7cd94e0 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 a32fc8e519..a32fc8e519 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 63b69d5a08..63b69d5a08 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 63b69d5a08..63b69d5a08 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 8abbb16845..8abbb16845 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 5956c04e48..5956c04e48 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 e490449564..e490449564 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 1a3b91ded2..1a3b91ded2 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 caeb81bc4b..caeb81bc4b 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 03542d8f69..03542d8f69 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 caeb81bc4b..caeb81bc4b 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 5f099b717a..5f099b717a 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 95424ac2a6..95424ac2a6 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 556026a5ca..556026a5ca 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 30a38c87c0..30a38c87c0 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 2a9df60cf1..2a9df60cf1 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 2d47aa6a1f..2d47aa6a1f 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 364003d720..364003d720 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 364003d720..364003d720 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 1f7617e620..1f7617e620 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 b74aedba91..b74aedba91 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 6d330d417d..6d330d417d 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 6d330d417d..6d330d417d 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 d4b169260d..d4b169260d 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 d4b169260d..d4b169260d 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 597f3f9ede..597f3f9ede 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 b644391b5b..b644391b5b 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 597f3f9ede..597f3f9ede 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 4b6d4f5b8e..4b6d4f5b8e 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 4b6d4f5b8e..4b6d4f5b8e 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 02b07b61ba..02b07b61ba 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 02b07b61ba..02b07b61ba 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 6461b3ec62..6461b3ec62 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 8c12aa5fff..8c12aa5fff 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 4d82b18da7..4d82b18da7 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 d244b8d6e7..d244b8d6e7 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 d244b8d6e7..d244b8d6e7 100644
--- a/uisimulator/sdl/UI-zenvisionm60gb.bmp
+++ b/uisimulator/bitmaps/UI-zenvisionm60gb.bmp
diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make
index 86fcb2a3d2..2e6e75fdfe 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 $< $@