diff options
| author | Eli Zaretskii | 2017-09-19 20:31:02 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2017-09-19 20:31:02 +0300 |
| commit | 7b3d1c6beb54ef6c423a93df88aebfd6fecbe2c2 (patch) | |
| tree | ebd80cb577de50e9b99233c623fc99733f9e3c20 /src/Makefile.in | |
| parent | c83d0c5fdfd374d5c2e1547d05f02ab3b47a4a5a (diff) | |
| download | emacs-7b3d1c6beb54ef6c423a93df88aebfd6fecbe2c2.tar.gz emacs-7b3d1c6beb54ef6c423a93df88aebfd6fecbe2c2.zip | |
Fix MinGW64 build broken by recent MinGW64 import libraries
* configure.ac (W32_LIBS): Put -lusp10 before -lgdi32, as latest
MinGW64 import libraries require that. (Bug#28493)
* src/Makefile.in: Adjust commentary to the new order of w32
libraries.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 0e55ad4bb29..9a8c9c85f04 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -280,7 +280,7 @@ GNU_OBJC_CFLAGS=$(patsubst -specs=%-hardened-cc1,,@GNU_OBJC_CFLAGS@) | |||
| 280 | ## w32xfns.o w32select.o image.o w32uniscribe.o if HAVE_W32, else | 280 | ## w32xfns.o w32select.o image.o w32uniscribe.o if HAVE_W32, else |
| 281 | ## empty. | 281 | ## empty. |
| 282 | W32_OBJ=@W32_OBJ@ | 282 | W32_OBJ=@W32_OBJ@ |
| 283 | ## -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32 lusp10 -lcomctl32 | 283 | ## -lkernel32 -luser32 -lusp10 -lgdi32 -lole32 -lcomdlg32 -lcomctl32 |
| 284 | ## --lwinspool if HAVE_W32, else empty. | 284 | ## --lwinspool if HAVE_W32, else empty. |
| 285 | W32_LIBS=@W32_LIBS@ | 285 | W32_LIBS=@W32_LIBS@ |
| 286 | 286 | ||