diff options
| author | Eli Zaretskii | 2013-08-10 10:43:41 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-08-10 10:43:41 +0300 |
| commit | d4166523bc8c4565cde24fcda56d3d5cdabb70ce (patch) | |
| tree | 07cc67d6663b763e1f4915f5f4054073e99ab936 | |
| parent | 3a3bb90450d220c8fb336b80a9a4bdc5cc49a380 (diff) | |
| download | emacs-d4166523bc8c4565cde24fcda56d3d5cdabb70ce.tar.gz emacs-d4166523bc8c4565cde24fcda56d3d5cdabb70ce.zip | |
Provide a Windows manifest for update-game-score.exe.
lib-src/update-game-score.exe.manifest: New file.
lib-src/Makefile.in (UPDATE_MANIFEST): New variable.
(SCRIPTS): Add $(UPDATE_MANIFEST).
configure.ac: Define and substitute UPDATE_MANIFEST.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | lib-src/ChangeLog | 7 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 3 | ||||
| -rw-r--r-- | lib-src/update-game-score.exe.manifest | 10 |
5 files changed, 26 insertions, 1 deletions
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-08-10 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * configure.ac: Define and substitute UPDATE_MANIFEST. | ||
| 4 | |||
| 1 | 2013-08-04 Stephen Berman <stephen.berman@gmx.net> | 5 | 2013-08-04 Stephen Berman <stephen.berman@gmx.net> |
| 2 | 6 | ||
| 3 | * info/dir: Add todo-mode. | 7 | * info/dir: Add todo-mode. |
diff --git a/configure.ac b/configure.ac index 89aba556bb3..e4a846402f2 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -1641,6 +1641,7 @@ CLIENTRES= | |||
| 1641 | CLIENTW= | 1641 | CLIENTW= |
| 1642 | W32_RES_LINK= | 1642 | W32_RES_LINK= |
| 1643 | EMACS_MANIFEST= | 1643 | EMACS_MANIFEST= |
| 1644 | UPDATE_MANIFEST= | ||
| 1644 | if test "${with_w32}" != no; then | 1645 | if test "${with_w32}" != no; then |
| 1645 | case "${opsys}" in | 1646 | case "${opsys}" in |
| 1646 | cygwin) | 1647 | cygwin) |
| @@ -1691,6 +1692,7 @@ if test "${HAVE_W32}" = "yes"; then | |||
| 1691 | x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;; | 1692 | x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;; |
| 1692 | *) EMACS_MANIFEST="emacs-x86.manifest" ;; | 1693 | *) EMACS_MANIFEST="emacs-x86.manifest" ;; |
| 1693 | esac | 1694 | esac |
| 1695 | UPDATE_MANIFEST=update-game-score.exe.manifest | ||
| 1694 | if test "${opsys}" = "cygwin"; then | 1696 | if test "${opsys}" = "cygwin"; then |
| 1695 | W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32" | 1697 | W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32" |
| 1696 | W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool" | 1698 | W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool" |
| @@ -1717,6 +1719,7 @@ AC_SUBST(W32_OBJ) | |||
| 1717 | AC_SUBST(W32_LIBS) | 1719 | AC_SUBST(W32_LIBS) |
| 1718 | AC_SUBST(EMACSRES) | 1720 | AC_SUBST(EMACSRES) |
| 1719 | AC_SUBST(EMACS_MANIFEST) | 1721 | AC_SUBST(EMACS_MANIFEST) |
| 1722 | AC_SUBST(UPDATE_MANIFEST) | ||
| 1720 | AC_SUBST(CLIENTRES) | 1723 | AC_SUBST(CLIENTRES) |
| 1721 | AC_SUBST(CLIENTW) | 1724 | AC_SUBST(CLIENTW) |
| 1722 | AC_SUBST(W32_RES_LINK) | 1725 | AC_SUBST(W32_RES_LINK) |
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index da97246ef64..53d66ba1e37 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2013-08-10 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * update-game-score.exe.manifest: New file. | ||
| 4 | |||
| 5 | * Makefile.in (UPDATE_MANIFEST): New variable. | ||
| 6 | (SCRIPTS): Add $(UPDATE_MANIFEST). | ||
| 7 | |||
| 1 | 2013-08-05 Stefan Monnier <monnier@iro.umontreal.ca> | 8 | 2013-08-05 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 9 | ||
| 3 | * makefile.w32-in (lisp2): Add nadvice.elc. | 10 | * makefile.w32-in (lisp2): Add nadvice.elc. |
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 8285910cdbf..fe1900a2a40 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in | |||
| @@ -40,6 +40,7 @@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ | |||
| 40 | PROFILING_CFLAGS = @PROFILING_CFLAGS@ | 40 | PROFILING_CFLAGS = @PROFILING_CFLAGS@ |
| 41 | WARN_CFLAGS = @WARN_CFLAGS@ | 41 | WARN_CFLAGS = @WARN_CFLAGS@ |
| 42 | WERROR_CFLAGS = @WERROR_CFLAGS@ | 42 | WERROR_CFLAGS = @WERROR_CFLAGS@ |
| 43 | UPDATE_MANIFEST = @UPDATE_MANIFEST@ | ||
| 43 | 44 | ||
| 44 | # Program name transformation. | 45 | # Program name transformation. |
| 45 | TRANSFORM = @program_transform_name@ | 46 | TRANSFORM = @program_transform_name@ |
| @@ -132,7 +133,7 @@ DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT} | |||
| 132 | 133 | ||
| 133 | # Like UTILITIES, but they're not system-dependent, and should not be | 134 | # Like UTILITIES, but they're not system-dependent, and should not be |
| 134 | # deleted by the distclean target. | 135 | # deleted by the distclean target. |
| 135 | SCRIPTS= rcs2log | 136 | SCRIPTS= rcs2log $(UPDATE_MANIFEST) |
| 136 | 137 | ||
| 137 | # All files that are created by the linker, i.e., whose names end in ${EXEEXT}. | 138 | # All files that are created by the linker, i.e., whose names end in ${EXEEXT}. |
| 138 | EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL} | 139 | EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL} |
diff --git a/lib-src/update-game-score.exe.manifest b/lib-src/update-game-score.exe.manifest new file mode 100644 index 00000000000..1db836bec6b --- /dev/null +++ b/lib-src/update-game-score.exe.manifest | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8" standalone="yes"?> | ||
| 2 | <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> | ||
| 3 | <v3:trustInfo xmlns:v3="urn:schemas-microsoft-com:asm.v3"> | ||
| 4 | <v3:security> | ||
| 5 | <v3:requestedPrivileges> | ||
| 6 | <v3:requestedExecutionLevel level="asInvoker" /> | ||
| 7 | </v3:requestedPrivileges> | ||
| 8 | </v3:security> | ||
| 9 | </v3:trustInfo> | ||
| 10 | </assembly> | ||