shell32: Move image resources to a resources subdirectory.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dlls/shell32/Makefile.in

@@ -62,24 +62,24 @@ IDL_SRCS = \
 	shell32_tlb.idl
 
 SVG_SRCS = \
-	cdrom.svg \
-	control.svg \
-	delete.svg \
-	desktop.svg \
-	document.svg \
-	drive.svg \
-	floppy.svg \
-	folder.svg \
-	folder_open.svg \
-	internet.svg \
-	mycomputer.svg \
-	mydocs.svg \
-	netdrive.svg \
-	netdrive2.svg \
-	network.svg \
-	printer.svg \
-	ramdisk.svg \
-	recent.svg \
-	shortcut.svg \
-	trash_file.svg \
-	window.svg
+	resources/cdrom.svg \
+	resources/control.svg \
+	resources/delete.svg \
+	resources/desktop.svg \
+	resources/document.svg \
+	resources/drive.svg \
+	resources/floppy.svg \
+	resources/folder.svg \
+	resources/folder_open.svg \
+	resources/internet.svg \
+	resources/mycomputer.svg \
+	resources/mydocs.svg \
+	resources/netdrive.svg \
+	resources/netdrive2.svg \
+	resources/network.svg \
+	resources/printer.svg \
+	resources/ramdisk.svg \
+	resources/recent.svg \
+	resources/shortcut.svg \
+	resources/trash_file.svg \
+	resources/window.svg

dlls/shell32/shell32.rc

@@ -419,136 +419,136 @@ BEGIN
 END
 
 /* FIXME: Following resource is not yet added */
-/* @makedep: document.ico */
-IDI_SHELL_FILE ICON document.ico
+/* @makedep: resources/document.ico */
+IDI_SHELL_FILE ICON resources/document.ico
 
-/* @makedep: document.ico */
-IDI_SHELL_DOCUMENT ICON document.ico
+/* @makedep: resources/document.ico */
+IDI_SHELL_DOCUMENT ICON resources/document.ico
 
-/* @makedep: window.ico */
-IDI_SHELL_WINDOW ICON window.ico
+/* @makedep: resources/window.ico */
+IDI_SHELL_WINDOW ICON resources/window.ico
 
-/* @makedep: folder.ico */
-IDI_SHELL_FOLDER ICON folder.ico
+/* @makedep: resources/folder.ico */
+IDI_SHELL_FOLDER ICON resources/folder.ico
 
-/* @makedep: folder_open.ico */
-IDI_SHELL_FOLDER_OPEN ICON folder_open.ico
+/* @makedep: resources/folder_open.ico */
+IDI_SHELL_FOLDER_OPEN ICON resources/folder_open.ico
 
 /* FIXME: Following three resources are not yet added */
-/* @makedep: folder_open.ico */
-IDI_SHELL_FOLDER_OPEN_SMALL ICON folder_open.ico
-/* @makedep: folder_open.ico */
-IDI_SHELL_FOLDER_OPEN_LARGE ICON folder_open.ico
-/* @makedep: folder_open.ico */
-IDI_SHELL_FOLDER_SMALL_XP ICON folder_open.ico
+/* @makedep: resources/folder_open.ico */
+IDI_SHELL_FOLDER_OPEN_SMALL ICON resources/folder_open.ico
+/* @makedep: resources/folder_open.ico */
+IDI_SHELL_FOLDER_OPEN_LARGE ICON resources/folder_open.ico
+/* @makedep: resources/folder_open.ico */
+IDI_SHELL_FOLDER_SMALL_XP ICON resources/folder_open.ico
 
 /* FIXME: Following resource is not yet added */
-/* @makedep: floppy.ico */
-IDI_SHELL_5_12_FLOPPY ICON floppy.ico
+/* @makedep: resources/floppy.ico */
+IDI_SHELL_5_12_FLOPPY ICON resources/floppy.ico
 
 /* FIXME: Following resource is not yet added */
-/* @makedep: floppy.ico */
-IDI_SHELL_3_14_FLOPPY ICON floppy.ico
+/* @makedep: resources/floppy.ico */
+IDI_SHELL_3_14_FLOPPY ICON resources/floppy.ico
 
-/* @makedep: floppy.ico */
-IDI_SHELL_FLOPPY ICON floppy.ico
+/* @makedep: resources/floppy.ico */
+IDI_SHELL_FLOPPY ICON resources/floppy.ico
 
-/* @makedep: drive.ico */
-IDI_SHELL_DRIVE ICON drive.ico
+/* @makedep: resources/drive.ico */
+IDI_SHELL_DRIVE ICON resources/drive.ico
 
-/* @makedep: netdrive.ico */
-IDI_SHELL_NETDRIVE ICON netdrive.ico
+/* @makedep: resources/netdrive.ico */
+IDI_SHELL_NETDRIVE ICON resources/netdrive.ico
 
-/* @makedep: netdrive2.ico */
-IDI_SHELL_NETDRIVE2 ICON netdrive2.ico
+/* @makedep: resources/netdrive2.ico */
+IDI_SHELL_NETDRIVE2 ICON resources/netdrive2.ico
 
-/* @makedep: cdrom.ico */
-IDI_SHELL_CDROM ICON cdrom.ico
+/* @makedep: resources/cdrom.ico */
+IDI_SHELL_CDROM ICON resources/cdrom.ico
 
-/* @makedep: ramdisk.ico */
-IDI_SHELL_RAMDISK ICON ramdisk.ico
+/* @makedep: resources/ramdisk.ico */
+IDI_SHELL_RAMDISK ICON resources/ramdisk.ico
 
-/* @makedep: internet.ico */
-IDI_SHELL_ENTIRE_NETWORK ICON internet.ico
+/* @makedep: resources/internet.ico */
+IDI_SHELL_ENTIRE_NETWORK ICON resources/internet.ico
 
-/* @makedep: network.ico */
-IDI_SHELL_NETWORK ICON network.ico
+/* @makedep: resources/network.ico */
+IDI_SHELL_NETWORK ICON resources/network.ico
 
-/* @makedep: mycomputer.ico */
-IDI_SHELL_MY_COMPUTER ICON mycomputer.ico
+/* @makedep: resources/mycomputer.ico */
+IDI_SHELL_MY_COMPUTER ICON resources/mycomputer.ico
 
-/* @makedep: printer.ico */
-IDI_SHELL_PRINTER ICON printer.ico
+/* @makedep: resources/printer.ico */
+IDI_SHELL_PRINTER ICON resources/printer.ico
 
-/* @makedep: network.ico */
-IDI_SHELL_MY_NETWORK_PLACES ICON network.ico
+/* @makedep: resources/network.ico */
+IDI_SHELL_MY_NETWORK_PLACES ICON resources/network.ico
 
-/* @makedep: network.ico */
-IDI_SHELL_COMPUTERS_NEAR_ME ICON network.ico
+/* @makedep: resources/network.ico */
+IDI_SHELL_COMPUTERS_NEAR_ME ICON resources/network.ico
 
-/* @makedep: recent.ico */
-IDI_SHELL_RECENT_DOCUMENTS ICON recent.ico
+/* @makedep: resources/recent.ico */
+IDI_SHELL_RECENT_DOCUMENTS ICON resources/recent.ico
 
-/* @makedep: control.ico */
-IDI_SHELL_SETTINGS ICON control.ico
+/* @makedep: resources/control.ico */
+IDI_SHELL_SETTINGS ICON resources/control.ico
 
-/* @makedep: shortcut.ico */
-IDI_SHELL_SHORTCUT ICON shortcut.ico
+/* @makedep: resources/shortcut.ico */
+IDI_SHELL_SHORTCUT ICON resources/shortcut.ico
 
-/* @makedep: desktop.ico */
-IDI_SHELL_DESKTOP ICON desktop.ico
+/* @makedep: resources/desktop.ico */
+IDI_SHELL_DESKTOP ICON resources/desktop.ico
 
-/* @makedep: control.ico */
-IDI_SHELL_CONTROL_PANEL ICON control.ico
+/* @makedep: resources/control.ico */
+IDI_SHELL_CONTROL_PANEL ICON resources/control.ico
 
-/* @makedep: trash_file.ico */
-IDI_SHELL_FULL_RECYCLE_BIN ICON trash_file.ico
+/* @makedep: resources/trash_file.ico */
+IDI_SHELL_FULL_RECYCLE_BIN ICON resources/trash_file.ico
 
-/* @makedep: trash_file.ico */
-IDI_SHELL_TRASH_FILE ICON trash_file.ico
+/* @makedep: resources/trash_file.ico */
+IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico
 
-/* @makedep: delete.ico */
-IDI_SHELL_CONFIRM_DELETE ICON delete.ico
+/* @makedep: resources/delete.ico */
+IDI_SHELL_CONFIRM_DELETE ICON resources/delete.ico
 
-/* @makedep: mydocs.ico */
-IDI_SHELL_MY_DOCUMENTS ICON mydocs.ico
+/* @makedep: resources/mydocs.ico */
+IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico
 
 /* FIXME: Following resource is not yet added */
-/* @makedep: mydocs.ico */
-IDI_SHELL_FAVORITES ICON mydocs.ico
+/* @makedep: resources/mydocs.ico */
+IDI_SHELL_FAVORITES ICON resources/mydocs.ico
 
-/* @makedep: idb_tb_large.bmp */
-IDB_TB_LARGE_LIGHT BITMAP idb_tb_large.bmp
+/* @makedep: resources/idb_tb_large.bmp */
+IDB_TB_LARGE_LIGHT BITMAP resources/idb_tb_large.bmp
 
-/* @makedep: idb_tb_large.bmp */
-IDB_TB_LARGE_DARK BITMAP idb_tb_large.bmp
+/* @makedep: resources/idb_tb_large.bmp */
+IDB_TB_LARGE_DARK BITMAP resources/idb_tb_large.bmp
 
-/* @makedep: idb_tb_small.bmp */
-IDB_TB_SMALL_LIGHT BITMAP idb_tb_small.bmp
+/* @makedep: resources/idb_tb_small.bmp */
+IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp
 
-/* @makedep: idb_tb_small.bmp */
-IDB_TB_SMALL_DARK BITMAP idb_tb_small.bmp
+/* @makedep: resources/idb_tb_small.bmp */
+IDB_TB_SMALL_DARK BITMAP resources/idb_tb_small.bmp
 
-/* @makedep: searching.avi */
-IDR_AVI_SEARCHING AVI searching.avi
+/* @makedep: resources/searching.avi */
+IDR_AVI_SEARCHING AVI resources/searching.avi
 
-/* @makedep: searching.avi */
-IDR_AVI_SEARCH AVI searching.avi
+/* @makedep: resources/searching.avi */
+IDR_AVI_SEARCH AVI resources/searching.avi
 
-/* @makedep: searching.avi */
-IDR_AVI_FILEMOVE AVI searching.avi
+/* @makedep: resources/searching.avi */
+IDR_AVI_FILEMOVE AVI resources/searching.avi
 
-/* @makedep: searching.avi */
-IDR_AVI_FILECOPY AVI searching.avi
+/* @makedep: resources/searching.avi */
+IDR_AVI_FILECOPY AVI resources/searching.avi
 
-/* @makedep: searching.avi */
-IDR_AVI_FINDCOMPUTER AVI searching.avi
+/* @makedep: resources/searching.avi */
+IDR_AVI_FINDCOMPUTER AVI resources/searching.avi
 
-/* @makedep: searching.avi */
-IDR_AVI_FILENUKE AVI searching.avi
+/* @makedep: resources/searching.avi */
+IDR_AVI_FILENUKE AVI resources/searching.avi
 
-/* @makedep: searching.avi */
-IDR_AVI_FILEDELETE AVI searching.avi
+/* @makedep: resources/searching.avi */
+IDR_AVI_FILEDELETE AVI resources/searching.avi
 
 /* @makedep: AUTHORS */
 AUTHORS RCDATA AUTHORS