diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-07-01 12:51:43 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-07-01 12:51:43 +0800 |
| commit | 2b345772911487adc43142f3bf92e3dc41c0635d (patch) | |
| tree | db38bf369472aee02032525f59fca99d2a2a5766 | |
| parent | ada69a10df4e09dcaf8827ff87395f7a0e7650bf (diff) | |
| download | gobject-introspection-2b345772911487adc43142f3bf92e3dc41c0635d.tar.gz | |
MSVC Builds: Clean Up .gir Generation
Since commit f3128da2 we are passing in the .lib('s) to deduce the DLL(s)
that the introspection files need to look, so we don't have to make an
extra copy of the .lib that matches the
<namespace-name>-<namespace-version> convention anymore. Clean up a bit
as a result.
| -rw-r--r-- | build/gi-introspection-msvc.mak | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/build/gi-introspection-msvc.mak b/build/gi-introspection-msvc.mak index fc4f2581..3729c6f8 100644 --- a/build/gi-introspection-msvc.mak +++ b/build/gi-introspection-msvc.mak @@ -102,13 +102,6 @@ gi_list: @-echo ..\girepository\gitypelib.h >> $@ @-echo ..\girepository\gitypes.h >> $@ -# Make a copy of girepository-1.0.lib to girepository-2.0.lib for use -# during the linking stage of the dump binary, in the generation -# of GIRepository-2.0.gir (the resulting binary will still be -# linked and referring to the original girepository DLL) -win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\girepository-$(GLIB_APIVERSION).lib: win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\girepository-$(GI_APIVERSION).lib - @-copy /b win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\girepository-$(GI_APIVERSION).lib $@ - # Generated .gir files for GLib/GModule/GObject/Gio/GIRepository GLib-$(GLIB_APIVERSION).gir: glib_list @-echo Generating $@... @@ -148,7 +141,7 @@ Gio-$(GLIB_APIVERSION).gir: gio_list GObject-$(GLIB_APIVERSION).gir -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include \ -I$(BASEDIR)\include --filelist=gio_list -o $@ -GIRepository-$(GLIB_APIVERSION).gir: gi_list GObject-$(GLIB_APIVERSION).gir win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\girepository-$(GLIB_APIVERSION).lib +GIRepository-$(GLIB_APIVERSION).gir: gi_list GObject-$(GLIB_APIVERSION).gir @-echo Generating $@... $(PYTHON2) $(G_IR_SCANNER_CURRENT) --verbose --warn-all \ --add-include-path=..\gir --add-include-path=. --namespace=GIRepository --nsversion=$(GLIB_APIVERSION) \ @@ -199,7 +192,6 @@ clean: @-del /f/q ..\gir\cairo-$(GI_APIVERSION).gir @-del /f/q *.typelib @-del /f/q *.gir - @-del /f/q win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\girepository-$(GLIB_APIVERSION).lib @-del /f/q gi_list @-del /f/q gio_list @-del /f/q gobject_list |