procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix icon for the cygw32 build on 64-bit Cygwin. (Bug#12993)

Browse source 
* nt/emacs.rc: Use 64-bit manifest for 64-bit Cygwin build.

* configure.ac (W32_RES_LINK): Remove unnecessary linker directive
`-Wl,-bpe-i386', which is confusing in the 64-bit case.
This commit is contained in:
Ken Brown 2013-04-08 22:38:56 -04:00
parent 7ffe7ef6ba
commit ba3b2d88d8
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-04-09 Ken Brown <kbrown@cornell.edu>
* configure.ac (W32_RES_LINK): Remove unneeded linker directive
`-Wl,-bpe-i386', which is confusing in the 64-bit case.
(Bug#12993)
2013-04-07 Paul Eggert <eggert@cs.ucla.edu>
Fix --enable-profiling bug introduced by 2013-02-25 change (Bug#13783).

2
configure.ac
View file

@ -1527,7 +1527,7 @@ if test "${with_w32}" != no; then
W32_RES="emacs.res"
# Tell the linker that emacs.res is an object (which we compile from
# the rc file), not a linker script.
W32_RES_LINK="-Wl,-bpe-i386 -Wl,emacs.res"
W32_RES_LINK="-Wl,emacs.res"
fi
AC_SUBST(W32_OBJ)
AC_SUBST(W32_LIBS)

5
nt/ChangeLog
View file

@ -1,3 +1,8 @@
2013-04-09 Ken Brown <kbrown@cornell.edu>
* emacs.rc: Use 64-bit manifest for 64-bit Cygwin build.
(Bug#12993)
2013-04-01 Eli Zaretskii <eliz@gnu.org>
* README: A better documentation of ddeclient.exe.

2
nt/emacs.rc
View file

@ -1,6 +1,6 @@
Emacs ICON icons/emacs.ico
32649 CURSOR icons/hand.cur
#ifdef WIN64
#if defined (WIN64) || defined (__x86_64__)
1 24 "emacs-x64.manifest"
#else
1 24 "emacs-x86.manifest"