diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-07-01 12:59:47 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-07-01 12:59:47 +0800 |
| commit | a215b076e1896cd2bd5f11d0ec90ed0c0c6690ed (patch) | |
| tree | 36fa83eb73f58793b9b12e23266651888a165b5b | |
| parent | 07fa3ac7737e39976a23384244199b57d5479b56 (diff) | |
| download | gdk-pixbuf-a215b076e1896cd2bd5f11d0ec90ed0c0c6690ed.tar.gz | |
MSVC Introspection Builds: Clean up a bit
Since gobject-introsection-1.40.0 we are passing in the .lib file(s) to
deduce the DLL(s) that the introspection files should look for, instead of
just passing in the DLL file(s), we no longer need to make a copy of the
main .lib file to match the <namespace-name>-<namespace-version> convention
for use during the linking stage of the introspection build. Remove that
from the introspection builds as a result.
| -rw-r--r-- | build/gdk-pixbuf-introspection-msvc.mak | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/build/gdk-pixbuf-introspection-msvc.mak b/build/gdk-pixbuf-introspection-msvc.mak index 43d7d7ac9..e4c4a9fe4 100644 --- a/build/gdk-pixbuf-introspection-msvc.mak +++ b/build/gdk-pixbuf-introspection-msvc.mak @@ -15,10 +15,6 @@ gdkpixbuf_list: @-echo Generating Filelist to Introspect for GDK-Pixbuf... $(PYTHON2) gen-file-list-gdkpixbuf.py -win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkPixbuf-$(APIVERSION).lib: win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk_pixbuf-$(APIVERSION).lib - @-echo Copying win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkPixbuf-$(APIVERSION).lib from win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk_pixbuf-$(APIVERSION).lib... - @-copy /b win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk_pixbuf-$(APIVERSION).lib win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkPixbuf-$(APIVERSION).lib - setgirbuildnev: @-set CC=$(CC) @-set PYTHONPATH=$(BASEDIR)\lib\gobject-introspection @@ -26,7 +22,7 @@ setgirbuildnev: @-set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) @-set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB) -GdkPixbuf-$(APIVERSION).gir: gdkpixbuf_list win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkPixbuf-$(APIVERSION).lib +GdkPixbuf-$(APIVERSION).gir: gdkpixbuf_list @-echo Generating GdkPixbuf-$(APIVERSION).gir... $(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk-pixbuf \ -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include \ @@ -56,6 +52,5 @@ install-introspection: all clean: @-del /f/q GdkPixbuf-$(APIVERSION).typelib @-del /f/q GdkPixbuf-$(APIVERSION).gir - @-del /f/q win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkPixbuf-$(APIVERSION).lib @-del /f/q gdkpixbuf_list @-del /f/q *.pyc |