From 7b3d1c6beb54ef6c423a93df88aebfd6fecbe2c2 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 19 Sep 2017 20:31:02 +0300 Subject: [PATCH] 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. --- configure.ac | 8 ++++---- src/Makefile.in | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 6452038d1b9..0b0bb5e144b 100644 --- a/configure.ac +++ b/configure.ac @@ -2077,15 +2077,15 @@ if test "${HAVE_W32}" = "yes"; then AC_SUBST(comma_space_version) AC_CONFIG_FILES([nt/emacs.rc nt/emacsclient.rc]) if test "${opsys}" = "cygwin"; then - W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32" - W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool" + W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lusp10 -lgdi32" + W32_LIBS="$W32_LIBS -lole32 -lcomdlg32 -lcomctl32 -lwinspool" # Tell the linker that emacs.res is an object (which we compile from # the rc file), not a linker script. W32_RES_LINK="-Wl,emacs.res" else 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 -lmpr -lwinspool -lole32 -lcomctl32 -lusp10" + W32_LIBS="$W32_LIBS -lwinmm -lusp10 -lgdi32 -lcomdlg32" + W32_LIBS="$W32_LIBS -lmpr -lwinspool -lole32 -lcomctl32" W32_RES_LINK="\$(EMACSRES)" CLIENTRES="emacsclient.res" CLIENTW="emacsclientw\$(EXEEXT)" 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@) ## w32xfns.o w32select.o image.o w32uniscribe.o if HAVE_W32, else ## empty. W32_OBJ=@W32_OBJ@ -## -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32 lusp10 -lcomctl32 +## -lkernel32 -luser32 -lusp10 -lgdi32 -lole32 -lcomdlg32 -lcomctl32 ## --lwinspool if HAVE_W32, else empty. W32_LIBS=@W32_LIBS@