Changeset b4f28e0 in git for lib/icons/Makefile.am


Ignore:
Timestamp:
25/02/15 06:35:31 (5 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
1b0bf6a
Parents:
261ab22
Message:

lib/icons/Makefile.am,lib/icons/xpm2png,src/mainfrm.cc: Fix display
of icons for toolbar and notebook under WXMSW.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/icons/Makefile.am

    r261ab22 rb4f28e0  
    3030        pres_tree.xpm
    3131
    32 ico_files = $(xpm_files:.xpm=.ico)
     32# These ".rcdata" files are PNGs, but we end up with a loop of implicit rules
     33# if we call them ".png", and the .rc file doesn't care about the extension.
     34rcdata_files = $(xpm_files:.xpm=.rcdata)
    3335
    3436aven-icons.rc: Makefile.am
    35         perl -e 'for (@ARGV) { /(.*)\.ico$$/ and print "$$1 ICON $$_\n" }' \
    36           $(ico_files) > aven-icons.rc
     37        perl -e 'for (@ARGV) { /(.*)\.rcdata$$/ and $$1 ne "aven" and print "$$1 RCDATA $$_\n" }' \
     38          $(rcdata_files) > aven-icons.rc
    3739
    3840icondir = $(pkgdatadir)/icons
     
    7274        $(SHELL) $(srcdir)/xpm2winicon $< $@
    7375
     76.xpm.rcdata:
     77        $(SHELL) $(srcdir)/xpm2png $< $@
     78
    7479iconsets = Aven.iconset.zip svxedit.iconset.zip\
    7580        3d.iconset.zip err.iconset.zip plt.iconset.zip pos.iconset.zip\
     
    7883MAINTAINERCLEANFILES = $(iconsets)
    7984
    80 BUILT_SOURCES = aven-icons.rc $(ico_files)
     85BUILT_SOURCES = aven-icons.rc $(rcdata_files)
    8186
    8287EXTRA_DIST = png2winicon png2iconsetzip svg2iconsetzip\
    8388        aven-icons.rc\
    8489        $(xpm_files)\
    85         $(ico_files)\
     90        $(rcdata_files)\
    8691        aven.ico svxedit.ico\
    8792        3d.ico err.ico plt.ico pos.ico svx.ico\
Note: See TracChangeset for help on using the changeset viewer.