commit 2cb5fb04cf02cf04acd42c12e09d209abfbf266e parent 34aa0db6cc46dc3f9d49a9f303221ae3b1252d41 Author: Evgeny Grin (Karlson2k) <k2k@narod.ru> Date: Wed, 26 Feb 2014 17:55:49 +0000 Fix W32 resource compile if '-isystem' flag is used in CPPFLAGS Diffstat:
| M | src/microhttpd/Makefile.am | | | 5 | ++++- |
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am @@ -92,8 +92,11 @@ libmicrohttpd_la_LIBADD += $(MHD_DLL_RES_LO) # by empty object generated from empty c-file. Later libtool will # use .libs/file.o for shared lib and empty file.o for static lib. # This implementation is based on trick found in liblzma. +# Note: windres does not understand '-isystem' flag, so all +# possible '-isystem' flags are replaced by simple '-I' flags. $(MHD_DLL_RES_LO): $(MHD_DLL_RES_SRC) - $(LIBTOOL) $(AM_V_lt) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(RC) $(RCFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $< -o $@ && \ + RC_CPP_FLAGS=" $(DEFAULT_INCLUDES) $(INCLUDES) $(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) " && \ + $(LIBTOOL) $(AM_V_lt) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(RC) $(RCFLAGS) $(DEFS) $${RC_CPP_FLAGS// -isystem / -I } $< -o $@ && \ echo > $@-empty.c && $(CC) $(AM_CFLAGS) $(CFLAGS) -c $@-empty.c -o $(@:.lo=.o) && rm -f $@-empty.c endif