# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1454255104 -3600
# Node ID b512d9cce1519aafefb542aa5a3d3f5b47eae816
# Parent  94a5e76a2c68c06dd660e2cb12fc912eddfd43f8
commit https://github.com/vim/vim/commit/bbb3339dbfa2067fab616698739097df06aa5e6c
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Jan 31 16:37:33 2016 +0100

    patch 7.4.1224
    Problem:    Build problems with GTK on BSD. (Mike Williams)
    Solution:   Don't use "$<". Skip building gui_gtk_gresources.h when it doesn't
                work. (Kazunobu Kuriyama)

diff --git a/src/Makefile b/src/Makefile
--- a/src/Makefile
+++ b/src/Makefile
@@ -2646,9 +2646,11 @@ GUI_GTK_RES_INPUTS = \
 	../pixmaps/stock_vim_window_split_vertical.png
 
 auto/gui_gtk_gresources.c: gui_gtk_res.xml $(GUI_GTK_RES_INPUTS)
-	$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $<
+	$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register gui_gtk_res.xml
 auto/gui_gtk_gresources.h: gui_gtk_res.xml $(GUI_GTK_RES_INPUTS)
-	$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $<
+	if test -z "$(GLIB_COMPILE_RESOURCES)"; then touch $@; else \
+		$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register gui_gtk_res.xml; \
+	fi
 
 # All the object files are put in the "objects" directory.  Since not all make
 # commands understand putting object files in another directory, it must be
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1224,
+/**/
     1223,
 /**/
     1222,