From: Michael Gilbert Date: Sat, 19 Mar 2022 00:48:02 +0000 (+0000) Subject: regenerate all icon files X-Git-Tag: archive/raspbian/7.0_repack-10+rpi1~23 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e74dc97497b9fc7afe9ca88d8e7af91bd782937d;p=wine.git regenerate all icon files Gbp-Pq: Topic generate Gbp-Pq: Name icons.patch --- diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 4ea068e..dd88c1c 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -58,4 +58,8 @@ SVG_SRCS = \ idc_copy.svg \ idc_divider.svg \ idc_divideropen.svg \ - idc_movebutton.svg + idc_movebutton.svg \ + idi_dragarrow.svg \ + idi_tt_info_sm.svg \ + idi_tt_warn_sm.svg \ + idi_tt_error_sm.svg diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in index 20242b6..a1a0d51 100644 --- a/dlls/comdlg32/Makefile.in +++ b/dlls/comdlg32/Makefile.in @@ -22,6 +22,12 @@ SVG_SRCS = \ pd32_collate.svg \ pd32_landscape.svg \ pd32_nocollate.svg \ - pd32_portrait.svg + pd32_portrait.svg \ + cdrom.svg \ + hdisk.svg \ + floppy.svg \ + folder.svg \ + folder2.svg \ + network.svg IDL_SRCS = comdlg32_classes.idl diff --git a/dlls/display.drv16/Makefile.in b/dlls/display.drv16/Makefile.in index 533ff36..3cbc99a 100644 --- a/dlls/display.drv16/Makefile.in +++ b/dlls/display.drv16/Makefile.in @@ -6,3 +6,5 @@ EXTRADLLFLAGS = -m16 C_SRCS = display.c RC_SRCS = display.rc + +SVG_SRCS = oic_hand.svg diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index 5b9df84..41842bb 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -20,4 +20,4 @@ RC_SRCS = regedit.rc MANPAGES = regedit.man.in -SVG_SRCS = regedit.svg +SVG_SRCS = regedit.svg folderopen.svg folder.svg computer.svg string.svg bin.svg diff --git a/programs/taskmgr/Makefile.in b/programs/taskmgr/Makefile.in index c385e9b..5b79de0 100644 --- a/programs/taskmgr/Makefile.in +++ b/programs/taskmgr/Makefile.in @@ -26,4 +26,6 @@ C_SRCS = \ RC_SRCS = taskmgr.rc SVG_SRCS = \ - taskmgr.svg + taskmgr.svg \ + window.svg \ + windowsm.svg diff --git a/tools/makedep.c b/tools/makedep.c index 0ec8600..eb2dc9d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1577,6 +1577,9 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ if (pFile->type == INCL_SYSTEM) return NULL; /* ignore system files we cannot find */ + /* no reason to check that files exist here, may be built later */ + return file; + /* try in src file directory */ if ((file = open_file_same_dir( pFile->included_by, pFile->name, &pFile->filename ))) return file; @@ -2975,6 +2978,17 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, if (images[i]) { + struct incl_file *src; + LIST_FOR_EACH_ENTRY( src, &make->sources, struct incl_file, entry ) + { + if (strendswith( src->name, ".rc" )) + { + char *res = replace_extension( src->name, "rc", "res" ); + char *res_file = src_dir_path( make, res ); + char *obj_file = src_dir_path( make, obj ); + output( "%s: %s.%s\n", res_file, obj_file, images[i] ); + } + } output( "%s.%s: %s\n", src_dir_path( make, obj ), images[i], source->filename ); output( "\t%sCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n", cmd_prefix( "GEN" ), convert, icotool, rsvg,