[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r116930: Revert most of the recent change involvi
From: |
Ken Brown |
Subject: |
[Emacs-diffs] emacs-24 r116930: Revert most of the recent change involving manifests on Cygwin. (Bug#17176) |
Date: |
Wed, 09 Apr 2014 21:16:04 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116930
revision-id: address@hidden
parent: address@hidden
committer: Ken Brown <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-04-09 17:16:37 -0400
message:
Revert most of the recent change involving manifests on Cygwin. (Bug#17176)
* configure.ac (EMACS_MANIFEST): Revert last change (but leave
UPDATE_MANIFEST empty).
* nt/emacs.rc: Revert last change.
* src/Makefile.in (EMACS_MANIFEST): Revert last change.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
nt/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1545
nt/emacs.rc emacs.rc-20091113204419-o5vbwnq5f7feedwu-875
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-631
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-04-03 19:10:35 +0000
+++ b/ChangeLog 2014-04-09 21:16:37 +0000
@@ -1,3 +1,8 @@
+2014-04-09 Ken Brown <address@hidden>
+
+ * configure.ac (EMACS_MANIFEST): Revert last change (but leave
+ UPDATE_MANIFEST empty).
+
2014-04-03 Ken Brown <address@hidden>
* configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these
=== modified file 'configure.ac'
--- a/configure.ac 2014-04-03 19:10:35 +0000
+++ b/configure.ac 2014-04-09 21:16:37 +0000
@@ -1834,6 +1834,10 @@
W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o"
W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o"
EMACSRES="emacs.res"
+ case "$canonical" in
+ x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
+ *) EMACS_MANIFEST="emacs-x86.manifest" ;;
+ esac
if test "${opsys}" = "cygwin"; then
W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
@@ -1841,10 +1845,6 @@
# the rc file), not a linker script.
W32_RES_LINK="-Wl,emacs.res"
else
- case "$canonical" in
- x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
- *) EMACS_MANIFEST="emacs-x86.manifest" ;;
- esac
UPDATE_MANIFEST=update-game-score.exe.manifest
W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o"
W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32"
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2014-04-03 19:10:35 +0000
+++ b/nt/ChangeLog 2014-04-09 21:16:37 +0000
@@ -1,3 +1,7 @@
+2014-04-09 Ken Brown <address@hidden>
+
+ * emacs.rc: Revert last change.
+
2014-04-03 Ken Brown <address@hidden>
* emacs.rc: Don't use manifest on Cygwin. (Bug#17176)
=== modified file 'nt/emacs.rc'
--- a/nt/emacs.rc 2014-04-03 19:10:35 +0000
+++ b/nt/emacs.rc 2014-04-09 21:16:37 +0000
@@ -1,12 +1,10 @@
Emacs ICON icons/emacs.ico
32649 CURSOR icons/hand.cur
-#ifndef __CYGWIN__
-#ifdef WIN64
+#if defined (WIN64) || defined (__x86_64__)
1 24 "emacs-x64.manifest"
#else
1 24 "emacs-x86.manifest"
#endif
-#endif
#ifndef VS_VERSION_INFO
#define VS_VERSION_INFO 1
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-04-07 16:08:46 +0000
+++ b/src/ChangeLog 2014-04-09 21:16:37 +0000
@@ -1,3 +1,7 @@
+2014-04-09 Ken Brown <address@hidden>
+
+ * Makefile.in (EMACS_MANIFEST): Revert last change.
+
2014-04-07 Stefan Monnier <address@hidden>
* lisp.h (struct Lisp_Symbol): New bitfield `pinned'.
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2014-04-03 19:10:35 +0000
+++ b/src/Makefile.in 2014-04-09 21:16:37 +0000
@@ -259,7 +259,7 @@
## emacs.res if HAVE_W32
EMACSRES = @EMACSRES@
-## emacs-*.manifest if WINDOWSNT
+## emacs-*.manifest if HAVE_W32
EMACS_MANIFEST = @EMACS_MANIFEST@
## If HAVE_W32, compiler arguments for including
## the resource file in the binary.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r116930: Revert most of the recent change involving manifests on Cygwin. (Bug#17176),
Ken Brown <=