moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Guenter Knauf 2014-11-18 13:44:03 +01:00
parent 6cc79dc79d
commit 46ae340f24
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Makefile.m32
View File

@ -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"

10
src/Makefile.m32
View File

@ -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"