[PATCH 02/48] Added new icon build rule

[Joel Holdsworth]

Alexandre Julliard <julliard at winehq.org> wrote:
> Joel Holdsworth <joel at airwebreathe.org.uk> writes:
>
> > @@ -188,6 +188,11 @@ filter: dummy
> >  .man.in.man:
> >          LC_ALL=C sed -e 's, at bindir\@,$(bindir),g' -e
> >'s, at dlldir\@,$(dlldir),g' -e 's, at PACKAGE_STRING\@, at PACKAGE_STRING@,g' $< >$@
> >|| ($(RM) $@ && false)
> > 
> > +# Rules for icons
> > +
> > +ifdef SVG_SRCS
> > +
> > +# Depreciated icon build rule
> >  .svg.ico:
> >          $(RSVG) -w 16 -h 16 -f png $< $*-16.png
> >          $(RSVG) -w 32 -h 32 -f png $< $*-32.png
> > @@ -195,6 +200,17 @@ filter: dummy
> >          $(ICOTOOL) -c -o $@ $*-16.png $*-32.png $*-48.png
> >          $(RM) $*-16.png $*-32.png $*-48.png
> > 
> > +else
> > +
> > +resources/%-32.png: resources/%.svg
> > +        $(RSVG) -f png $< $@
> > +
> > +resources/%.ico : resources/%-*-4.png resources/%-*-8.png \
> > +        resources/%-16-32.png resources/%-32-32.png resources/%-48-32.png
> > +        $(ICOTOOL) -c -o $@ $^
> > +
> > +endif
>
> That's GNU make specific, you can't do that. 
Yes I wondered if that might be the case. Do you (or anyone) have any thoughts
about how to approach this? The .svg.ico suffix rule that's present at the
moment works if there's a 1:1 relationship; one svg results in one ico. My
problem is that a 9:1 relationship is required. Do you have any suggestions
about how to make a generic rule to do that? Does it require changes to makedep?
 

> Also please don't send such a huge patch series. The first step should
> be to get just one icon committed with the proper infrastructure. Then
> you can consider sending more of them, preferably one dll at a time.Sure - I
> can understand that. The reason I sent so many was that I wanted to show you
> that I don't plan to leave a depreciated SVG build rule lying around. I also
> wanted you to see and comment on my approach of creating resources
> subdirectories in these dlls like user32 has, and then putting the icon images
> in these.
 
What do you think?

Joel Holdsworth
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-devel/attachments/20100322/4425a8f3/attachment-0001.htm>