masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 19:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert most of the recent change involving manifests on Cygwin. (Bug#17176)

Browse source 
* 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.
This commit is contained in:
Ken Brown 2014-04-09 17:16:37 -04:00
parent 50c9a9b8a8
commit 0cccc183d7
6 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-04-09 Ken Brown <kbrown@cornell.edu>
* configure.ac (EMACS_MANIFEST): Revert last change (but leave
UPDATE_MANIFEST empty).
2014-04-03 Ken Brown <kbrown@cornell.edu> 2014-04-03 Ken Brown <kbrown@cornell.edu>
* configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these * configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these

8
configure.ac
View file

@ -1834,6 +1834,10 @@ if test "${HAVE_W32}" = "yes"; then
W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o" W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o"
W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o" W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o"
EMACSRES="emacs.res" EMACSRES="emacs.res"
case "$canonical" in
x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
*) EMACS_MANIFEST="emacs-x86.manifest" ;;
esac
if test "${opsys}" = "cygwin"; then if test "${opsys}" = "cygwin"; then
W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32" W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool" W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
@ -1841,10 +1845,6 @@ if test "${HAVE_W32}" = "yes"; then
# the rc file), not a linker script. # the rc file), not a linker script.
W32_RES_LINK="-Wl,emacs.res" W32_RES_LINK="-Wl,emacs.res"
else else
case "$canonical" in
x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
*) EMACS_MANIFEST="emacs-x86.manifest" ;;
esac
UPDATE_MANIFEST=update-game-score.exe.manifest UPDATE_MANIFEST=update-game-score.exe.manifest
W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o" W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o"
W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32" W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32"

4
nt/ChangeLog
View file

@ -1,3 +1,7 @@
2014-04-09 Ken Brown <kbrown@cornell.edu>
* emacs.rc: Revert last change.
2014-04-03 Ken Brown <kbrown@cornell.edu> 2014-04-03 Ken Brown <kbrown@cornell.edu>
* emacs.rc: Don't use manifest on Cygwin. (Bug#17176) * emacs.rc: Don't use manifest on Cygwin. (Bug#17176)

4
nt/emacs.rc
View file

@ -1,12 +1,10 @@
Emacs ICON icons/emacs.ico Emacs ICON icons/emacs.ico
32649 CURSOR icons/hand.cur 32649 CURSOR icons/hand.cur
#ifndef __CYGWIN__ #if defined (WIN64) || defined (__x86_64__)
#ifdef WIN64
1 24 "emacs-x64.manifest" 1 24 "emacs-x64.manifest"
#else #else
1 24 "emacs-x86.manifest" 1 24 "emacs-x86.manifest"
#endif #endif
#endif
#ifndef VS_VERSION_INFO #ifndef VS_VERSION_INFO
#define VS_VERSION_INFO 1 #define VS_VERSION_INFO 1

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2014-04-09 Ken Brown <kbrown@cornell.edu>
* Makefile.in (EMACS_MANIFEST): Revert last change.
2014-04-07 Stefan Monnier <monnier@iro.umontreal.ca> 2014-04-07 Stefan Monnier <monnier@iro.umontreal.ca>
* lisp.h (struct Lisp_Symbol): New bitfield `pinned'. * lisp.h (struct Lisp_Symbol): New bitfield `pinned'.

2
src/Makefile.in
View file

@ -259,7 +259,7 @@ W32_LIBS=@W32_LIBS@
## emacs.res if HAVE_W32 ## emacs.res if HAVE_W32
EMACSRES = @EMACSRES@ EMACSRES = @EMACSRES@
## emacs-*.manifest if WINDOWSNT ## emacs-*.manifest if HAVE_W32
EMACS_MANIFEST = @EMACS_MANIFEST@ EMACS_MANIFEST = @EMACS_MANIFEST@
## If HAVE_W32, compiler arguments for including ## If HAVE_W32, compiler arguments for including
## the resource file in the binary. ## the resource file in the binary.