[gobject-introspection] MSVC Builds: Clean Up .gir Generation
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] MSVC Builds: Clean Up .gir Generation
- Date: Tue, 1 Jul 2014 04:51:53 +0000 (UTC)
commit 2b345772911487adc43142f3bf92e3dc41c0635d
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Jul 1 12:51:43 2014 +0800
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.
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 fc4f258..3729c6f 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]