diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-07-01 13:15:51 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-07-01 13:15:51 +0800 |
| commit | 9822891e483afb50ab76f6c1c7c813b84626b7aa (patch) | |
| tree | 2895a8799845eef4a5f9248e99ecfb41feea14f0 | |
| parent | 0d4dca5ecbe4c8522f9c6c438d086d9858c54aeb (diff) | |
| download | gtk+-9822891e483afb50ab76f6c1c7c813b84626b7aa.tar.gz | |
MSVC Builds: Clean up Introspection Builds
Since g-i 1.40.0 we are using the .lib file(s) to determine the DLL(s) that
the introspection files should look for, instead of directly using the
DLL(s) directly, so it is no longer necessary to make copies of the GDK
.lib file to match the <namespace-name>-<namespace-version> convention when
we are building the introspection files for GdkWin32. Remove that from the
introspection build process as a result.
| -rw-r--r-- | build/gtk-introspection-msvc.mak | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/build/gtk-introspection-msvc.mak b/build/gtk-introspection-msvc.mak index ba6c4415fa..fe1fa3fd66 100644 --- a/build/gtk-introspection-msvc.mak +++ b/build/gtk-introspection-msvc.mak @@ -31,10 +31,6 @@ setgirbuildnev: @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) @set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB) -win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib: win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib - @-echo Copying win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib from win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib... - @-copy /b win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib - Gdk-$(APIVERSION).gir: gdk_list @-echo Generating Gdk-$(APIVERSION).gir... $(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk \ @@ -50,7 +46,7 @@ Gdk-$(APIVERSION).gir: gdk_list -DG_LOG_DOMAIN=\"Gdk\" -DGDK_COMPILATION \ --filelist=gdk_list -o $@ -GdkWin32-$(APIVERSION).gir: gdkwin32_list win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib +GdkWin32-$(APIVERSION).gir: gdkwin32_list @-echo Generating GdkWin32-$(APIVERSION).gir... $(PYTHON2) $(G_IR_SCANNER) --verbose -I.. -I..\gdk \ -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include \ @@ -105,7 +101,6 @@ all: clean: @-del /f/q *.typelib @-del /f/q *.gir - @-del /f/q win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).lib @-del /f/q gtk_list @-del /f/q gdkwin32_list @-del /f/q gdk_list |