diff options
| author | Ken Brown <kbrown@cornell.edu> | 2014-04-03 15:10:35 -0400 |
|---|---|---|
| committer | Ken Brown <kbrown@cornell.edu> | 2014-04-03 15:10:35 -0400 |
| commit | ebe8e0765cf469daeda515bab7e3afa6a35fcb43 (patch) | |
| tree | 6677e7b18ab6433ecf82df66874c15833b8509a8 /nt | |
| parent | b54b4b12d498ba451dcbde2de0fffbc2c9afc613 (diff) | |
| download | emacs-ebe8e0765cf469daeda515bab7e3afa6a35fcb43.tar.gz | |
Don't use manifest on Cygwin. (Bug#17176)
* nt/emacs.rc: Don't use manifest on Cygwin.
* configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these
variables empty on Cygwin.
* src/Makefile.in (EMACS_MANIFEST): Update comment.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/emacs.rc | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 62a33906b0d..8e2875805dd 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2014-04-03 Ken Brown <kbrown@cornell.edu> + + * emacs.rc: Don't use manifest on Cygwin. (Bug#17176) + 2014-02-17 Juanma Barranquero <lekktu@gmail.com> * Makefile.in (install): Create destination directory before copying diff --git a/nt/emacs.rc b/nt/emacs.rc index 92c303ad4ef..fa019b4d98a 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -1,10 +1,12 @@ Emacs ICON icons/emacs.ico 32649 CURSOR icons/hand.cur -#if defined (WIN64) || defined (__x86_64__) +#ifndef __CYGWIN__ +#ifdef WIN64 1 24 "emacs-x64.manifest" #else 1 24 "emacs-x86.manifest" #endif +#endif #ifndef VS_VERSION_INFO #define VS_VERSION_INFO 1 |