From: Ken Brown Date: Tue, 9 Apr 2013 02:38:56 +0000 (-0400) Subject: Fix icon for the cygw32 build on 64-bit Cygwin. (Bug#12993) X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~504 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ba3b2d88d847cf1669f3f0c340f8864c77fe59de;p=emacs.git Fix icon for the cygw32 build on 64-bit Cygwin. (Bug#12993) * 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. --- diff --git a/ChangeLog b/ChangeLog index 2dd796962d7..a2ebd3e912b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-04-09 Ken Brown + + * 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 Fix --enable-profiling bug introduced by 2013-02-25 change (Bug#13783). diff --git a/configure.ac b/configure.ac index 2d8c4c3473d..71e35ec8ff7 100644 --- a/configure.ac +++ b/configure.ac @@ -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) diff --git a/nt/ChangeLog b/nt/ChangeLog index 3d2c0e172ff..acc74488424 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2013-04-09 Ken Brown + + * emacs.rc: Use 64-bit manifest for 64-bit Cygwin build. + (Bug#12993) + 2013-04-01 Eli Zaretskii * README: A better documentation of ddeclient.exe. diff --git a/nt/emacs.rc b/nt/emacs.rc index d2703c45869..81d283f70af 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -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"