[PATCH 02/48] Added new icon build rule

Alexandre Julliard julliard at winehq.org
Mon Mar 22 06:15:47 CDT 2010


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.

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.

-- 
Alexandre Julliard
julliard at winehq.org



More information about the wine-devel mailing list