From efc4fa67575e58219626314aa8fb8dae2a919cf4 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 2 Nov 2016 15:19:34 +0800 Subject: MSVC builds: Don't ignore gsettingsbackend.h for Gio-2.0.gir Like the autotools builds, include this file as well when we generate Gio-2.0.gir. This is a follow-up commit for b8d92b0 (Gio-2.0.gir: Don't exclude gsettingsbackend.h and pass needed define). --- build/win32/gi-introspection-msvc.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/win32/gi-introspection-msvc.mak b/build/win32/gi-introspection-msvc.mak index c63d196f..7a87f197 100644 --- a/build/win32/gi-introspection-msvc.mak +++ b/build/win32/gi-introspection-msvc.mak @@ -71,7 +71,7 @@ gio_list: @-echo Generating file list for GIO... @-type NUL > $@ @-for /f %%a in ('dir /b $(PREFIX)\include\gio-win32-2.0\gio\*.h') do @echo $(PREFIX)\include\gio-win32-2.0\gio\%%a>> $@ - @-for /f %%a in ('dir /b $(PREFIX)\include\glib-2.0\gio\*.h') do @if not %%a == gsettingsbackend.h @echo $(PREFIX)\include\glib-2.0\gio\%%a>> $@ + @-for /f %%a in ('dir /b $(PREFIX)\include\glib-2.0\gio\*.h') do @echo $(PREFIX)\include\glib-2.0\gio\%%a>> $@ @-echo $(TOP_SRCDIR)\gir\gio-2.0.c>> $@ gi_list: @@ -119,7 +119,7 @@ Gio-$(GLIB_APIVERSION).gir: gio_list GObject-$(GLIB_APIVERSION).gir --add-include-path=$(TOP_SRCDIR)\gir --add-include-path=. --namespace=Gio --nsversion=$(GLIB_APIVERSION) \ --no-libtool --pkg=gio-$(GLIB_APIVERSION) --pkg=gio-windows-$(GLIB_APIVERSION) --include=GObject-$(GLIB_APIVERSION) \ --library=gio-2.0 --external-library --reparse-validate --warn-all \ - --identifier-prefix=G --include=GLib-$(GLIB_APIVERSION) --c-include="gio/gio.h" -DGIO_COMPILATION \ + --identifier-prefix=G --include=GLib-$(GLIB_APIVERSION) --c-include="gio/gio.h" -DGIO_COMPILATION -DG_SETTINGS_ENABLE_BACKEND \ -I$(PREFIX)\include\glib-2.0 -I$(PREFIX)\lib\glib-2.0\include \ -I$(PREFIX)\include --filelist=gio_list -o $@ -- cgit v1.2.1