From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 14 Apr 2013 15:15:31 +0000 (+0300)
Subject: Fixed linking with the resource file.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~229^2~63^2~43
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f1fecede1890d514f1d65b4c804714509e3dc401;p=emacs.git

Fixed linking with the resource file.
---

diff --git a/configure.ac b/configure.ac
index 295e4198e24..9c8e05cb30f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1596,6 +1596,7 @@ if test "${HAVE_W32}" = "yes"; then
     W32_OBJ="$W32_OBJ w32notify.o"
     W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32"
     W32_LIBS="$W32_LIBS -lmpr -lwinspool -lole32 -lcomctl32 -lusp10"
+    W32_RES_LINK="\$(EMACSRES)"
     CLIENTRES="emacsclient.res"
     CLIENTW="emacsclientw\$(EXEEXT)"
     FIRSTFILE_OBJ=firstfile.o
diff --git a/src/Makefile.in b/src/Makefile.in
index 283396acc89..2e56f8f2fe1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -263,9 +263,10 @@ W32_LIBS=@W32_LIBS@
 EMACSRES = @EMACSRES@
 ## emacs-*.manifest if HAVE_W32
 EMACS_MANIFEST = @EMACS_MANIFEST@
-## If HAVE_W32 and CYGWIN, compiler arguments for including
+## If HAVE_W32, compiler arguments for including
 ## the resource file in the binary.
-## XXX -Wl,-b -Wl,pe-i386 -Wl,emacs.res
+## Cygwin: -Wl,-b -Wl,pe-i386 -Wl,emacs.res
+## MinGW: emacs.res
 W32_RES_LINK=@W32_RES_LINK@
 
 ## Empty if !HAVE_X_WINDOWS
@@ -481,8 +482,7 @@ $(lib)/libgnu.a: $(config_h)
 temacs$(EXEEXT): stamp-oldxmenu $(ALLOBJS) \
 	         $(lib)/libgnu.a $(EMACSRES)
 	$(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \
-	  -o temacs $(ALLOBJS) $(lib)/libgnu.a $(LIBES) \
-	  $(W32_RES_LINK)
+	  -o temacs $(ALLOBJS) $(lib)/libgnu.a $(W32_RES_LINK) $(LIBES)
 	$(TEMACS_POST_LINK)
 	test "$(CANNOT_DUMP)" = "yes" || \
 	  test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT)