summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2014-02-25 12:52:10 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2014-02-25 12:52:10 +0800
commit8103a66ee65fba4eceb617b22d0ec5af941fc0cb (patch)
treebd8b961c013feaf78a0190a21c0c6b2794dda404
parent7b6af72de616ae1cb1bb8f85adbec8d281efc755 (diff)
downloadatk-8103a66ee65fba4eceb617b22d0ec5af941fc0cb.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 ATK can continue to be properly built.
-rw-r--r--build/atk-introspection-msvc.mak7
1 files changed, 1 insertions, 6 deletions
diff --git a/build/atk-introspection-msvc.mak b/build/atk-introspection-msvc.mak
index 72618f7..8b4c38c 100644
--- a/build/atk-introspection-msvc.mak
+++ b/build/atk-introspection-msvc.mak
@@ -1,10 +1,5 @@
# NMake Makefile to build Introspection Files for ATK
-# Change or pass in as a variable/env var if needed
-DLLNAME = atk-1-vs$(VSVER)
-
-# Please do not change anything after this line
-
!include testsrules_msvc.mak
APIVERSION = 1.0
@@ -29,7 +24,7 @@ Atk-$(APIVERSION).gir: atk_list
@set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(BASEDIR)\lib;$(LIB)
$(PYTHON2) $(G_IR_SCANNER) --verbose -I.. --add-include-path=.. \
--namespace=Atk --nsversion=$(APIVERSION) --include=GObject-2.0 \
- --no-libtool --pkg=glib-2.0 --library=$(DLLNAME) \
+ --no-libtool --pkg=glib-2.0 --library=atk-1.0 \
--reparse-validate --add-include-path=$(G_IR_INCLUDEDIR) \
--pkg-export atk --warn-all --c-include "atk/atk.h" \
-DATK_DISABLE_DEPRECATED -DATK_COMPILATION -DATK_LOCALEDIR=\"/dummy/share/locale\" \