[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112251: Fix icon for the cygw32 buil
From: |
Ken Brown |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112251: Fix icon for the cygw32 build on 64-bit Cygwin. (Bug#12993) |
Date: |
Mon, 08 Apr 2013 22:38:56 -0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 112251
committer: Ken Brown <address@hidden>
branch nick: trunk
timestamp: Mon 2013-04-08 22:38:56 -0400
message:
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.
modified:
ChangeLog
configure.ac
nt/ChangeLog
nt/emacs.rc
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-04-07 06:21:40 +0000
+++ b/ChangeLog 2013-04-09 02:38:56 +0000
@@ -1,3 +1,9 @@
+2013-04-09 Ken Brown <address@hidden>
+
+ * 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 <address@hidden>
Fix --enable-profiling bug introduced by 2013-02-25 change (Bug#13783).
=== modified file 'configure.ac'
--- a/configure.ac 2013-04-07 06:21:40 +0000
+++ b/configure.ac 2013-04-09 02:38:56 +0000
@@ -1527,7 +1527,7 @@
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)
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2013-04-01 07:28:56 +0000
+++ b/nt/ChangeLog 2013-04-09 02:38:56 +0000
@@ -1,3 +1,8 @@
+2013-04-09 Ken Brown <address@hidden>
+
+ * emacs.rc: Use 64-bit manifest for 64-bit Cygwin build.
+ (Bug#12993)
+
2013-04-01 Eli Zaretskii <address@hidden>
* README: A better documentation of ddeclient.exe.
=== modified file 'nt/emacs.rc'
--- a/nt/emacs.rc 2013-03-05 03:59:35 +0000
+++ b/nt/emacs.rc 2013-04-09 02:38:56 +0000
@@ -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"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112251: Fix icon for the cygw32 build on 64-bit Cygwin. (Bug#12993),
Ken Brown <=