build: in Makefile.m32 pass -F flag to windres. (46ae340f) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/Makefile.m32

+7 −2

Original line number	Diff line number	Diff line
		@@ -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"

+8 −2

Original line number	Diff line number	Diff line
		@@ -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"