Merge branch 'master' into devel

Conflicts:

	snippets/linux

diff --git a/snippets/linux b/snippets/linux
index 09f4ad18506d8ab5cdea4049a061b67c18fcf0d4..2be4bea0fd2009cded3c755119c8fff3fb736699 100644 (file)
--- a/snippets/linux
+++ b/snippets/linux
@@ -411,7 +411,7 @@ $(2)/$(1)$(EXE_SUFFIX): $$($(1)_objs)
        @echo >>$$(dir)/$(1).exe.d
 endef
 
--include $(shell find $(USER_BUILD_DIR) -name '*.omkvar')
+-include $(shell true; find $(USER_BUILD_DIR) -name '*.omkvar') # `true' is a hack for MinGW
 #$(warning $(shared_libs))
 $(foreach lib,$(shared_libs),$(eval $(call solib_link_template,$(lib))))
 $(foreach prg,$(bin_programs),$(eval $(call program_link_template,$(prg),$(USER_BIN_DIR))))