diff options
| author | NARUSE, Yui <naruse@airemix.jp> | 2021-02-01 20:27:16 +0900 |
|---|---|---|
| committer | NARUSE, Yui <naruse@airemix.jp> | 2021-02-01 20:27:16 +0900 |
| commit | d1fb0a39537d4536869921383ee2a223cc6dfac9 (patch) | |
| tree | 51c4f6035c2a7260075c90922f3c1c74cc38f423 /cygwin | |
| parent | 42f02a0bac2c037b4e00a9811c5548c5ec7d28a7 (diff) | |
merge revision(s) 952b2dcc8804cbf094f8f626e04bcb3f8e151005: [Backport #17602]
Fix for windres 2.36 [Bug #17602]
Add --preprocessor and --preprocessor-arg for each preprocessor
command arguments, as windres 2.36 requires preprocessor name and
arguments to be separated to respect spaces in these paths.
---
cygwin/GNUmakefile.in | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Diffstat (limited to 'cygwin')
| -rw-r--r-- | cygwin/GNUmakefile.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index e9f186f121..86098814a1 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -4,7 +4,10 @@ include Makefile ENABLE_SHARED=@ENABLE_SHARED@ DLLWRAP = @DLLWRAP@ --target=@target_os@ --driver-name="$(CC)" -WINDRES = @WINDRES@ --preprocessor="$(CPP) -xc" -DRC_INVOKED +windres-cpp := $(CPP) -xc +windres-cpp := --preprocessor=$(firstword $(windres-cpp)) \ + $(addprefix --preprocessor-arg=,$(wordlist 2,$(words $(windres-cpp)),$(windres-cpp))) +WINDRES = @WINDRES@ $(windres-cpp) -DRC_INVOKED STRIP = @STRIP@ ifeq (@target_os@,cygwin) |