Changeset c0abf5a in git


Ignore:
Timestamp:
06/06/10 10:37:10 (9 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/survex-1_1, svn/tags/1.1.14, svn/tags/1.1.15, svn/tags/1.1.16, svn/tags/1.2.0, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/tags/v1_1_13, svn/trunk, travis-osx
Children:
de0f6e1
Parents:
a2bc929
Message:

src/Makefile.am: Use wx-config's --rescomp option to get the command
and options needed to turn .rc files into object files.

git-svn-id: file:///home/survex-svn/survex/branches/survex-1_1@3391 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    ra2bc929 rc0abf5a  
     1Sun Jun 06 09:36:06 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * src/Makefile.am: Use wx-config's --rescomp option to get the command
     4          and options needed to turn .rc files into object files.
     5
    16Fri Jun 04 15:32:27 GMT 2010  Olly Betts <olly@survex.com>
    27
  • src/Makefile.am

    ra2bc929 rc0abf5a  
    6262
    6363svxeditrc.o: $(srcdir)/svxedit.rc svxedit.ico
    64         pwd=`pwd` && cd $(srcdir) && i586-mingw32msvc-windres -o "$$pwd/svxeditrc.o" svxedit.rc
     64        pwd=`pwd` && cd $(srcdir) && `$(WX_CONFIG) --rescomp` -o "$$pwd/svxeditrc.o" svxedit.rc
    6565
    6666svxedit.ico: ../lib/icons/svxedit.ico
     
    7171# FIXME: use path on WXCONFIG to get --include-dir, or something?
    7272avenrc.o: $(srcdir)/aven.rc aven.ico
    73         pwd=`pwd` && cd $(srcdir) && i586-mingw32msvc-windres --include-dir /opt/wxmsw/include --include-dir /usr/i586-mingw32msvc/include/wx-2.8 -o "$$pwd/avenrc.o" aven.rc
     73        pwd=`pwd` && cd $(srcdir) && `$(WX_CONFIG) --rescomp` -o "$$pwd/avenrc.o" aven.rc
    7474
    7575aven.ico: ../lib/icons/aven.ico
Note: See TracChangeset for help on using the changeset viewer.