diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-08-07 12:09:52 +0000 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-08-07 12:09:52 +0000 |
| commit | da189b26c10a40efb3fe981e9b19f5401d5c8482 (patch) | |
| tree | b5a19ab2849c2e010d0ff7ba9cec7d8910b4f64d | |
| parent | 14ff69f032c603e6100728088ebbda19fd44db8a (diff) | |
| parent | ba43ef597f72191e63db57b91f7ad797c14d4dfe (diff) | |
| download | gobject-introspection-gnome-3-28.tar.gz | |
Merge branch 'msvc.fixes.328' into 'gnome-3-28'gnome-3-28
MSVC Builds: Fix _giscanner projects
See merge request GNOME/gobject-introspection!21
| -rw-r--r-- | win32/gi-introspection-msvc.mak | 6 | ||||
| -rw-r--r-- | win32/vs10/_giscanner.vcxproj | 4 | ||||
| -rw-r--r-- | win32/vs10/_giscanner.vcxproj.filters | 4 | ||||
| -rw-r--r-- | win32/vs9/_giscanner.vcproj | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/win32/gi-introspection-msvc.mak b/win32/gi-introspection-msvc.mak index 78ca3958..bdc2acea 100644 --- a/win32/gi-introspection-msvc.mak +++ b/win32/gi-introspection-msvc.mak @@ -96,7 +96,7 @@ GLib-$(GLIB_APIVERSION).gir: glib_list @-echo Generating $@... $(PYTHON) $(G_IR_SCANNER_CURRENT) --verbose -I$(TOP_SRCDIR) --add-include-path=$(TOP_SRCDIR) \ --add-include-path=$(TOP_SRCDIR)\gir --add-include-path=. --namespace=GLib --nsversion=$(GLIB_APIVERSION) \ - --no-libtool --pkg=gio-windows-$(GLIB_APIVERSION) --pkg=glib-$(GLIB_APIVERSION) \ + --no-libtool --pkg=glib-$(GLIB_APIVERSION) \ --include=win32-$(GI_APIVERSION) --library=glib-2.0 --library=gobject-2.0 \ --external-library --reparse-validate --identifier-prefix=G --symbol-prefix=g \ --symbol-prefix=glib --c-include="glib.h" -I$(PREFIX)\include\glib-$(GLIB_APIVERSION) \ @@ -117,7 +117,7 @@ GObject-$(GLIB_APIVERSION).gir: gobject_list GModule-$(GLIB_APIVERSION).gir $(PYTHON) $(G_IR_SCANNER_CURRENT) --verbose -I$(TOP_SRCDIR) --add-include-path=$(TOP_SRCDIR) \ --add-include-path=$(TOP_SRCDIR)\gir --add-include-path=. --namespace=GObject --nsversion=$(GLIB_APIVERSION) \ --no-libtool --include=GLib-$(GLIB_APIVERSION) --pkg=gobject-$(GLIB_APIVERSION) --library=gobject-2.0 \ - --external-library --reparse-validate --identifier-prefix=G --c-include="glib-gobject.h" \ + --external-library --reparse-validate --identifier-prefix=G --c-include="glib-object.h" \ -I$(PREFIX)/include/glib-2.0 -I$(PREFIX)/lib/glib-2.0/include -I$(PREFIX)/include \ -DGOBJECT_COMPILATION --filelist=gobject_list -o $@ @@ -127,7 +127,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 -DG_SETTINGS_ENABLE_BACKEND \ + --identifier-prefix=G --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 $@ diff --git a/win32/vs10/_giscanner.vcxproj b/win32/vs10/_giscanner.vcxproj index d8cb7f8e..97d97dda 100644 --- a/win32/vs10/_giscanner.vcxproj +++ b/win32/vs10/_giscanner.vcxproj @@ -172,8 +172,8 @@ </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\..\giscanner\giscannermodule.c" /> - <ClCompile Include="..\..\scannerlexer.c" /> - <ClCompile Include="..\..\scannerparser.c" /> + <ClCompile Include="..\..\giscanner\scannerlexer.c" /> + <ClCompile Include="..\..\giscanner\scannerparser.c" /> <ClCompile Include="..\..\giscanner\sourcescanner.c" /> </ItemGroup> <ItemGroup> diff --git a/win32/vs10/_giscanner.vcxproj.filters b/win32/vs10/_giscanner.vcxproj.filters index 1ddc9a24..e1b08d47 100644 --- a/win32/vs10/_giscanner.vcxproj.filters +++ b/win32/vs10/_giscanner.vcxproj.filters @@ -16,8 +16,8 @@ </ItemGroup> <ItemGroup> <ClCompile Include="..\..\giscanner\giscannermodule.c"><Filter>Sources</Filter></ClCompile> - <ClCompile Include="..\..\scannerlexer.c"><Filter>Sources</Filter></ClCompile> - <ClCompile Include="..\..\scannerparser.c"><Filter>Sources</Filter></ClCompile> + <ClCompile Include="..\..\giscanner\scannerlexer.c"><Filter>Sources</Filter></ClCompile> + <ClCompile Include="..\..\giscanner\scannerparser.c"><Filter>Sources</Filter></ClCompile> <ClCompile Include="..\..\giscanner\sourcescanner.c"><Filter>Sources</Filter></ClCompile> </ItemGroup> </Project> diff --git a/win32/vs9/_giscanner.vcproj b/win32/vs9/_giscanner.vcproj index c6f0a3e4..5e3d22eb 100644 --- a/win32/vs9/_giscanner.vcproj +++ b/win32/vs9/_giscanner.vcproj @@ -159,8 +159,8 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File RelativePath="..\..\giscanner\giscannermodule.c" /> - <File RelativePath="..\..\scannerlexer.c" /> - <File RelativePath="..\..\scannerparser.c" /> + <File RelativePath="..\..\giscanner\scannerlexer.c" /> + <File RelativePath="..\..\giscanner\scannerparser.c" /> <File RelativePath="..\..\giscanner\sourcescanner.c" /> </Filter> <Filter |