summaryrefslogtreecommitdiff
path: root/lib/Makefile.m32
diff options
context:
space:
mode:
authorGuenter Knauf <lists@gknw.net>2014-11-18 13:44:03 +0100
committerGuenter Knauf <lists@gknw.net>2014-11-18 13:44:03 +0100
commit46ae340f249465b94c42e9836b9d94d74c965361 (patch)
treebfd5123cd4d9b54866862dab5d5f0fb844bd9306 /lib/Makefile.m32
parent6cc79dc79ddac4289544abb50006fe587cc53a4d (diff)
downloadcurl-46ae340f249465b94c42e9836b9d94d74c965361.tar.gz
build: in Makefile.m32 pass -F flag to windres.
Diffstat (limited to 'lib/Makefile.m32')
-rw-r--r--lib/Makefile.m329
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index c28d4526c..cb301c383 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"