From: Guenter Knauf <lists@gknw.net>
Date: Tue, 18 Nov 2014 12:44:03 +0000 (+0100)
Subject: build: in Makefile.m32 pass -F flag to windres.
X-Git-Tag: curl-7_40_0~350
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46ae340f249465b94c42e9836b9d94d74c965361;p=thirdparty%2Fcurl.git

build: in Makefile.m32 pass -F flag to windres.
---

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index c28d4526c8..cb301c3837 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -70,7 +70,12 @@ LDFLAGS	= -s
 AR	= $(CROSSPREFIX)ar
 RANLIB	= $(CROSSPREFIX)ranlib
 RC	= $(CROSSPREFIX)windres
-RCFLAGS	= --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF -i
+RCFLAGS	= --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF
+ifeq ($(ARCH),w64)
+RCFLAGS	+= -F pe-x86-64
+else
+RCFLAGS	+= -F pe-i386
+endif
 STRIP	= $(CROSSPREFIX)strip -g
 
 # Platform-dependent helper tool macros
@@ -297,7 +302,7 @@ $(libcurl_dll_LIBRARY): $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_DEPENDENC
 	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
 
 %.res: %.rc
-	$(RC) $(RCFLAGS) $< -o $@
+	$(RC) $(RCFLAGS) -i $< -o $@
 
 clean:
 ifeq "$(wildcard $(PROOT)/include/curl/curlbuild.h.dist)" "$(PROOT)/include/curl/curlbuild.h.dist"
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index ddfed417a8..614c2b637f 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -81,7 +81,13 @@ endif
 LDFLAGS	= -s
 AR	= $(CROSSPREFIX)ar
 RC	= $(CROSSPREFIX)windres
-RCFLAGS	= --include-dir=$(PROOT)/include -O COFF -i
+RCFLAGS	= --include-dir=$(PROOT)/include -O COFF
+ifeq ($(ARCH),w64)
+RCFLAGS += -F pe-x86-64
+else
+RCFLAGS += -F pe-i386
+endif
+STRIP   = $(CROSSPREFIX)strip -g
 
 # We may need these someday
 # PERL = perl
@@ -320,7 +326,7 @@ tool_hugehelp.c:
 	$(CC) $(INCLUDES) $(CFLAGS) -c $<
 
 %.res: %.rc
-	$(RC) $(RCFLAGS) $< -o $@
+	$(RC) $(RCFLAGS) -i $< -o $@
 
 clean:
 ifeq "$(wildcard tool_hugehelp.c.cvs)" "tool_hugehelp.c.cvs"