Changeset 9227253 in git


Ignore:
Timestamp:
04/06/10 14:05:53 (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:
b685e4e
Parents:
a5e8ada
Message:

src/Makefile.am: Update path to wx RC file.

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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    ra5e8ada r9227253  
     1Fri Jun 04 13:05:18 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * src/Makefile.am: Update path to wx RC file.
     4
    15Fri Jun 04 12:44:39 GMT 2010  Olly Betts <olly@survex.com>
    26
  • src/Makefile.am

    ra5e8ada r9227253  
    6969editwrap_LDADD = svxeditrc.o
    7070
    71 # FIXME: use path on WXCONFIG to get --include-dir?
     71# 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 -o "$$pwd/avenrc.o" aven.rc
     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
    7474
    7575aven.ico: ../lib/icons/aven.ico
Note: See TracChangeset for help on using the changeset viewer.