]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
Makefile.m32: Improve windres parameter compatibility
authorJay Satiro <raysatiro@yahoo.com>
Sat, 14 Mar 2020 06:51:33 +0000 (02:51 -0400)
committerJay Satiro <raysatiro@yahoo.com>
Sat, 14 Mar 2020 23:08:17 +0000 (19:08 -0400)
- s/COFF/coff/

Some versions of windres do not recognize uppercase COFF as a valid
way to specify the COFF output format.

Reported-by: Steven Penny
Fixes https://github.com/curl/curl/issues/5099
Closes https://github.com/curl/curl/pull/5101

docs/examples/Makefile.m32
lib/Makefile.m32
src/Makefile.m32

index 160afb62f363fa03c40e7de7a593d58327c97ddd..dd989a8fb81fa5111cb79140654bdc8bc58b1999 100644 (file)
@@ -106,7 +106,7 @@ CFLAGS += -fno-strict-aliasing
 # comment LDFLAGS below to keep debug info
 LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_EXE) -s
 RC = $(CROSSPREFIX)windres
-RCFLAGS = --include-dir=$(PROOT)/include -O COFF
+RCFLAGS = --include-dir=$(PROOT)/include -O coff
 
 # Set environment var ARCH to your architecture to override autodetection.
 ifndef ARCH
index ac6b3de631dca288a85d846f2ec80efd018c9e2f..fe8701bdb6603c8afb542a4f91eb41bd31b9ea17 100644 (file)
@@ -99,7 +99,7 @@ LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_DLL) -s
 AR = $(CURL_AR)
 RANLIB = $(CURL_RANLIB)
 RC = $(CROSSPREFIX)windres
-RCFLAGS = --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF
+RCFLAGS = --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O coff
 STRIP   = $(CROSSPREFIX)strip -g
 
 # Set environment var ARCH to your architecture to override autodetection.
index e13db04b901a145e8cc9cb73160baa9cfcff7ff0..f34d9643773e6dc78a0419b676cf3e4e41488033 100644 (file)
@@ -107,7 +107,7 @@ CFLAGS += -fno-strict-aliasing
 LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_EXE) -s
 AR = $(CURL_AR)
 RC = $(CROSSPREFIX)windres
-RCFLAGS = --include-dir=$(PROOT)/include -O COFF -DCURL_EMBED_MANIFEST
+RCFLAGS = --include-dir=$(PROOT)/include -O coff -DCURL_EMBED_MANIFEST
 STRIP   = $(CROSSPREFIX)strip -g
 
 # We may need these someday