diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-02-25 13:16:51 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-02-25 13:16:51 +0800 |
| commit | 27693187e309f7e7fbb2f75a709e71dd4119428e (patch) | |
| tree | 721d0c45c35dad56bc6c57ea61b8f44425678d64 | |
| parent | 05e4927ab0b7b4ead30c47c26e881711a1724d63 (diff) | |
| download | pango-27693187e309f7e7fbb2f75a709e71dd4119428e.tar.gz | |
MSVC Builds: Update Introspection Build Process
GObject-Introspection was recently changed to support acquiring the name of
the DLL from a library (.lib, etc) that was passed into g-ir-scanner on
Windows, like the *nix builds, instead of directly passing in the name of
the DLL.
This updates the introspection build process, so that introspection files
for Pango can continue to be properly built.
| -rw-r--r-- | build/pango-introspection-msvc.mak | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/build/pango-introspection-msvc.mak b/build/pango-introspection-msvc.mak index ff2773da..4a493b83 100644 --- a/build/pango-introspection-msvc.mak +++ b/build/pango-introspection-msvc.mak @@ -1,14 +1,5 @@ # NMake Makefile to build Introspection Files for Pango -# Change or pass in as variable/env var if needed -DLLPREFIX = -DLLSUFFIX = -1-vs$(VSVER) -PANGO_DLLNAME = $(DLLPREFIX)pango$(DLLSUFFIX) -PANGOFT_DLLNAME = $(DLLPREFIX)pangoft2$(DLLSUFFIX) -PANGOCAIRO_DLLNAME = $(DLLPREFIX)pangocairo$(DLLSUFFIX) - -# Please do not change anything after this line - !include testsrules_msvc.mak APIVERSION = 1.0 @@ -21,7 +12,7 @@ CHECK_PACKAGE = gobject-2.0 cairo !if "$(BUILD_PANGOFT2_INTROSPECTION)" == "1" # Build of PangoFT2 introspection files is not currently supported. -PangoFT2LIBS = --library=$(PANGO_DLLNAME) +PangoFT2LIBS = --library=pangoft2-1.0 PangoFT2GIR = --include-uninstalled=./PangoFT2-$(APIVERSION) all: setbuildenv Pango-$(APIVERSION).gir Pango-$(APIVERSION).typelib PangoFT2-$(APIVERSION).gir PangoFT2-$(APIVERSION).typelib PangoCairo-$(APIVERSION).gir PangoCairo-$(APIVERSION).typelib @@ -53,7 +44,7 @@ Pango-$(APIVERSION).gir: pango_list -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include \ --namespace=Pango --nsversion=$(APIVERSION) \ --include=GObject-2.0 --include=cairo-1.0 \ - --no-libtool --pkg=gobject-2.0 --pkg=cairo --pkg=glib-2.0 --library=$(PANGO_DLLNAME) \ + --no-libtool --pkg=gobject-2.0 --pkg=cairo --pkg=glib-2.0 --library=pango-1.0 \ --reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) \ --pkg-export pango --warn-all --c-include "pango/pango.h" \ -DG_LOG_DOMAIN=\"Pango\" -DPANGO_ENABLE_BACKEND -DPANGO_ENABLE_ENGINE \ @@ -66,7 +57,7 @@ PangoCairo-$(APIVERSION).gir: Pango-$(APIVERSION).gir -I$(BASEDIR)\include\glib-2.0 -I$(BASEDIR)\lib\glib-2.0\include -I$(BASEDIR)\include \ --namespace=PangoCairo --nsversion=$(APIVERSION) \ --include=GObject-2.0 --include=cairo-1.0 \ - --no-libtool --pkg=gobject-2.0 --pkg=cairo --library=$(PANGOCAIRO_DLLNAME) $(PangoFT2LIBS) --library=$(PANGO_DLLNAME) \ + --no-libtool --pkg=gobject-2.0 --pkg=cairo --library=pangocairo-1.0 $(PangoFT2LIBS) --library=pango-1.0 \ --reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) --add-include-path=. \ --pkg-export pangocairo --warn-all $(PangoFT2GIR) --include-uninstalled=./Pango-$(APIVERSION).gir \ --c-include "pango/pangocairo.h" \ |