[pango] MSVC Builds: Rework Introspection Build

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [pango] MSVC Builds: Rework Introspection Build
Date: Fri, 10 Jan 2014 08:58:48 +0000 (UTC)
commit c825bb054b38d0cc78f878d115189ff32a4773a2
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Jan 10 16:58:38 2014 +0800

    MSVC Builds: Rework Introspection Build
    
    The current approach of building the introspection files for Pango works,
    but is often cumbersome as one needs to set many environmental variables
    before launching a solution file, which runs a Windows batch script to
    generate the .gir/.typelib files. It was also possible to hand-run the
    batch script from the Visual Studio command prompt, but even more
    environmental variables need to be set.
    
    This changes the approach to build the introspection files using an NMake
    Makefile (but elimating from the Visual Studio Project Files the part to
    build the introspection files) to:
    
    -Make it clearer to the person building the introspection files what
     environmental variables are needed, specifically for PKG_CONFIG_PATH and
     MINGWDIR and CFG (formerly CONF). Setting stuff like VSVER, PLAT and
     BASEDIR is no longer required, which was a bit clunky.
    -Allows some more easier flexibility on the build of the intropsection
     files.

 build/Makefile.am                        |    6 +
 build/{win32 => }/gen-file-list-pango.py |   25 +++--
 build/introspection-msvc.mak             |   79 ++++++++++++++
 build/pango-introspection-msvc.mak       |  106 +++++++++++++++++++
 build/testsrules_msvc.mak                |   72 +++++++++++++
 build/win32/Makefile.am                  |    4 +-
 build/win32/gengir_pango.bat             |  169 ------------------------------
 build/win32/vs10/Makefile.am             |    2 -
 build/win32/vs10/gengir.vcxproj          |  112 --------------------
 build/win32/vs10/pango-gengir.props      |   31 ------
 build/win32/vs10/pango.sln               |   10 --
 build/win32/vs9/Makefile.am              |    2 -
 build/win32/vs9/gengir.vcproj            |   77 --------------
 build/win32/vs9/pango-gengir.vsprops     |   21 ----
 build/win32/vs9/pango.sln                |   14 ---
 15 files changed, 280 insertions(+), 450 deletions(-)
---
diff --git a/build/Makefile.am b/build/Makefile.am
index 73e7a6f..0ca470b 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -1,3 +1,9 @@
 SUBDIRS = win32
 
+EXTRA_DIST = \
+       pango-introspection-msvc.mak    \
+       introspection-msvc.mak  \
+       testsrules_msvc.mak     \
+       gen-file-list-pango.py
+
 -include $(top_srcdir)/git.mk
diff --git a/build/win32/gen-file-list-pango.py b/build/gen-file-list-pango.py
similarity index 88%
rename from build/win32/gen-file-list-pango.py
rename to build/gen-file-list-pango.py
index 2515353..fa438c0 100644
--- a/build/win32/gen-file-list-pango.py
+++ b/build/gen-file-list-pango.py
@@ -40,19 +40,17 @@ def gen_pangoft_filelist(srcroot, subdir, dest):
             d.write(srcroot + '\\' + subdir + '\\' + i.replace('/', '\\') + '\n')
 
 def gen_pangocairo_filelist(srcroot, subdir, dest, is_fc_used):
+    cond_pangocairo = {}
+    if is_fc_used == 1:
+        cond_pangocairo = {'HAVE_CAIRO_WIN32': True, 'PLATFORM_WIN32': True, 'HAVE_CAIRO_FREETYPE': True}
+    else:
+        cond_pangocairo = {'HAVE_CAIRO_WIN32': True, 'PLATFORM_WIN32': True}
     vars = read_vars_from_AM(os.path.join(srcroot, subdir, 'Makefile.am'),
                              vars = {},
-                             conds = {},
+                             conds = cond_pangocairo,
                              filters = ['libpangocairo_1_0_la_SOURCES', 'pangocairo_headers'])
-    vars['pangocairo_win32_introspection_files'] = 'pangocairo-win32font.c pangocairo-win32fontmap.c 
pangocairo-win32.h'
-    if is_fc_used == 1:
-        vars['pangocairo_ft2_introspection_files'] = 'pangocairo-fcfont.c pangocairo-fcfontmap.c 
pangocairo-fc.h'
-    else:
-        vars['pangocairo_ft2_introspection_files'] = ''
 
     files = vars['libpangocairo_1_0_la_SOURCES'].split() + \
-            vars['pangocairo_win32_introspection_files'].split() + \
-            vars['pangocairo_ft2_introspection_files'].split() + \
             vars['pangocairo_headers'].split()
 
     sources = [i for i in files \
@@ -74,6 +72,7 @@ def read_vars_from_AM(path, vars = {}, conds = {}, filters = None):
     RE_AM_VAR_REF = re.compile(r'\$\((\w+?)\)')
     RE_AM_VAR = re.compile(r'^\s*(\w+)\s*=(.*)$')
     RE_AM_INCLUDE = re.compile(r'^\s*include\s+(\w+)')
+    RE_AM_VAR_ADD = re.compile(r'^\s*(\w+)\s*\+=(.*)$')
     RE_AM_CONTINUING = re.compile(r'\\\s*$')
     RE_AM_IF = re.compile(r'^\s*if\s+(\w+)')
     RE_AM_ELSE = re.compile(r'^\s*else')
@@ -131,6 +130,14 @@ def read_vars_from_AM(path, vars = {}, conds = {}, filters = None):
             if mo:
                 cur_vars[mo.group(1)] = am_eval(mo.group(2).strip())
                 continue
+            mo = RE_AM_VAR_ADD.search(line)
+            if mo:
+                try:
+                    cur_vars[mo.group(1)] += ' '
+                except KeyError:
+                    cur_vars[mo.group(1)] = ''
+                cur_vars[mo.group(1)] += am_eval(mo.group(2).strip())
+                continue
 
     #filter:
     if filters != None:
@@ -142,7 +149,7 @@ def read_vars_from_AM(path, vars = {}, conds = {}, filters = None):
         return cur_vars
 
 def main(argv):
-    srcroot = '..\\..'
+    srcroot = '..'
     subdir = 'pango'
     gen_pango_filelist(srcroot, subdir, 'pango_list')
     gen_pangoft_filelist(srcroot, subdir, 'pangoft_list')
diff --git a/build/introspection-msvc.mak b/build/introspection-msvc.mak
new file mode 100644
index 0000000..3670c2f
--- /dev/null
+++ b/build/introspection-msvc.mak
@@ -0,0 +1,79 @@
+# Common Utility NMake Makefile Template
+# Used to Generate Introspection files for various Projects
+
+# Can Override with env vars as needed
+# You will need to have built gobject-introspection for this to work.
+# Change or pass in or set the following to suit your environment
+
+BASEDIR = ..\..\vs$(VSVER)\$(PLAT)
+GIR_SUBDIR = share\gir-1.0
+GIR_SUBDIR = share\gir-1.0
+G_IR_SCANNER = $(BASEDIR)\bin\g-ir-scanner
+G_IR_COMPILER = $(BASEDIR)\bin\g-ir-compiler.exe
+G_IR_INCLUDEDIR = $(BASEDIR)\$(GIR_SUBDIR)
+G_IR_TYPELIBDIR = $(BASEDIR)\$(GIR_SUBDIR)
+
+# Note: The PYTHON2 must be a Python 2.6.x or 2.7.x Interpretor!
+# Either having python.exe from Python 2.6.x/2.7.x in your PATH will work
+# or passing in PYTHON2=<full path to your Python 2.6.x/2.7.x interpretor> will do
+
+# This is required, and gobject-introspection needs to be built
+# before this can be successfully run.
+PYTHON2=python
+
+# Don't change anything following this line!
+VALID_PKG_CONFIG_PATH = FALSE
+VALID_GCC_INSTPATH = FALSE
+
+MSG_INVALID_PKGCONFIG = You must set or specifiy a valid PKG_CONFIG_PATH
+MSG_INVALID_MINGWDIR = You must set or specifiy a valid MINGWDIR, where gcc.exe can be found in 
%MINGWDIR%\bin
+MSG_INVALID_CFG = You need to specify or set CFG to be release or debug to use this Makefile to build the 
Introspection Files
+
+ERROR_MSG =
+
+BUILD_INTROSPECTION = TRUE
+
+!if ![pkg-config --print-errors --errors-to-stdout $(CHECK_PACKAGE) > pkgconfig.x]     \
+       && ![setlocal]  \
+       && ![set file="pkgconfig.x"]    \
+       && ![FOR %A IN (%file%) DO @echo PKG_CHECK_SIZE=%~zA > pkgconfig.chksize]       \
+       && ![del $(ERRNUL) /q/f pkgconfig.x]
+!endif
+
+!include pkgconfig.chksize
+!if "$(PKG_CHECK_SIZE)" == "0"
+VALID_PKG_CONFIG_PATH = TRUE
+!else
+VALID_PKG_CONFIG_PATH = FALSE
+!endif
+
+!if ![IF EXIST %MINGWDIR%\bin\gcc.exe @echo VALID_GCC_INSTPATH=TRUE > gcccheck.x]
+!endif
+
+!if ![IF NOT EXIST %MINGWDIR%\bin\gcc.exe @echo VALID_GCC_INSTPATH=FALSE > gcccheck.x]
+!endif
+
+!include gcccheck.x
+
+!if ![del $(ERRNUL) /q/f pkgconfig.chksize gcccheck.x]
+!endif
+
+VALID_CFGSET = FALSE
+!if "$(CFG)" == "release" || "$(CFG)" == "debug"
+VALID_CFGSET = TRUE
+!endif
+
+!if "$(VALID_GCC_INSTPATH)" != "TRUE"
+BUILD_INTROSPECTION = FALSE
+ERROR_MSG = $(MSG_INVALID_MINGWDIR)
+!endif
+
+!if "$(VALID_PKG_CONFIG_PATH)" != "TRUE"
+BUILD_INTROSPECTION = FALSE
+ERROR_MSG = $(MSG_INVALID_PKGCONFIG)
+!endif
+
+!if "$(VALID_CFGSET)" != "TRUE"
+BUILD_INTROSPECTION = FALSE
+ERROR_MSG = $(MSG_INVALID_CFG)
+!endif
diff --git a/build/pango-introspection-msvc.mak b/build/pango-introspection-msvc.mak
new file mode 100644
index 0000000..504f804
--- /dev/null
+++ b/build/pango-introspection-msvc.mak
@@ -0,0 +1,106 @@
+# 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
+
+CHECK_PACKAGE = gobject-2.0 cairo
+
+!include introspection-msvc.mak
+
+!if "$(BUILD_INTROSPECTION)" == "TRUE"
+!if "$(BUILD_PANGOFT2_INTROSPECTION)" == "1"
+
+# Build of PangoFT2 introspection files is not currently supported.
+PangoFT2LIBS = --library=$(PANGO_DLLNAME)
+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
+
+!else
+
+PangoFT2LIBS =
+PangoFT2GIR =
+
+all: setbuildenv Pango-$(APIVERSION).gir Pango-$(APIVERSION).typelib PangoCairo-$(APIVERSION).gir 
PangoCairo-$(APIVERSION).typelib
+
+install-introspection: setbuildenv Pango-$(APIVERSION).gir Pango-$(APIVERSION).typelib 
PangoCairo-$(APIVERSION).gir PangoCairo-$(APIVERSION).typelib
+       @-copy Pango-$(APIVERSION).gir $(G_IR_INCLUDEDIR)
+       @-copy /b Pango-$(APIVERSION).typelib $(G_IR_TYPELIBDIR)
+       @-copy PangoCairo-$(APIVERSION).gir $(G_IR_INCLUDEDIR)
+       @-copy /b PangoCairo-$(APIVERSION).typelib $(G_IR_TYPELIBDIR)
+!endif
+
+setbuildenv:
+       @set CC=$(CC)
+       @set PYTHONPATH=$(BASEDIR)\lib\gobject-introspection
+       @set PATH=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PATH);$(MINGWDIR)\bin
+       @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
+
+Pango-$(APIVERSION).gir: pango_list
+       @-echo Generating Pango-$(APIVERSION).gir...
+       $(PYTHON2) $(G_IR_SCANNER) --verbose -I..       \
+       -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)    \
+       --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   \
+       -DSYSCONFDIR=\"/dummy/etc\" -DLIBDIR=\"/dummy/lib\"     \
+       --filelist=pango_list -o Pango-$(APIVERSION).gir
+
+PangoCairo-$(APIVERSION).gir: Pango-$(APIVERSION).gir
+       @-echo Generating PangoCairo-$(APIVERSION).gir...
+       $(PYTHON2) $(G_IR_SCANNER) --verbose -I..       \
+       -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)   \
+       --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"        \
+       -I..\.. -DG_LOG_DOMAIN=\"Pango\" -DPANGO_ENABLE_BACKEND \
+       -DPANGO_ENABLE_ENGINE -DSYSCONFDIR=\"/dummy/etc\" -DLIBDIR=\"/dummy/lib\"       \
+       --filelist=pangocairo_list -o PangoCairo-$(APIVERSION).gir
+
+pangocairo_list: pango_list
+
+pango_list:
+       @-echo Generating Filelist to Introspect for Pango...
+       $(PYTHON2) gen-file-list-pango.py
+
+Pango-$(APIVERSION).typelib: Pango-$(APIVERSION).gir
+       @-echo Compiling Pango-$(APIVERSION).typelib...
+       $(G_IR_COMPILER) --includedir=. --debug --verbose Pango-$(APIVERSION).gir -o 
Pango-$(APIVERSION).typelib
+
+PangoCairo-$(APIVERSION).typelib: PangoCairo-$(APIVERSION).gir Pango-$(APIVERSION).typelib
+       @-echo Compiling PangoCairo-$(APIVERSION).typelib...
+       $(G_IR_COMPILER) --includedir=. --debug --verbose PangoCairo-$(APIVERSION).gir -o 
PangoCairo-$(APIVERSION).typelib
+
+!else
+all:
+       @-echo $(ERROR_MSG)
+!endif
+
+clean:
+       @-del /f/q PangoCairo-$(APIVERSION).typelib
+       @-del /f/q PangoCairo-$(APIVERSION).gir
+       @-del /f/q PangoFT2-$(APIVERSION).typelib
+       @-del /f/q PangoFT2-$(APIVERSION).gir
+       @-del /f/q Pango-$(APIVERSION).typelib
+       @-del /f/q Pango-$(APIVERSION).gir
+       @-del /f/q pangocairoft_list
+       @-del /f/q pangocairo_list
+       @-del /f/q pangoft_list
+       @-del /f/q pango_list
+       @-del /f/q *.pyc
diff --git a/build/testsrules_msvc.mak b/build/testsrules_msvc.mak
new file mode 100644
index 0000000..1f4669e
--- /dev/null
+++ b/build/testsrules_msvc.mak
@@ -0,0 +1,72 @@
+# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or
+# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir)
+!if !defined(VCINSTALLDIR) && !defined(WINDOWSSDKDIR)
+MSG = ^
+This Makefile is only for Visual Studio 2008 and later.^
+You need to ensure that the Visual Studio Environment is properly set up^
+before running this Makefile.
+!error $(MSG)
+!endif
+
+ERRNUL  = 2>NUL
+_HASH=^#
+
+!if ![echo VCVERSION=_MSC_VER > vercl.x] \
+    && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \
+    && ![echo PLAT=Win32 >> vercl.x] \
+    && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \
+    && ![echo PLAT=x64 >> vercl.x] \
+    && ![echo $(_HASH)endif >> vercl.x] \
+    && ![cl -nologo -TC -P vercl.x $(ERRNUL)]
+!include vercl.i
+!if ![echo VCVER= ^\> vercl.vc] \
+    && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc]
+!include vercl.vc
+!endif
+!endif
+!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc]
+!endif
+
+!if $(VCVERSION) > 1499 && $(VCVERSION) < 1600
+VSVER = 9
+!elseif $(VCVERSION) > 1599 && $(VCVERSION) < 1700
+VSVER = 10
+!elseif $(VCVERSION) > 1699 && $(VCVERSION) < 1800
+VSVER = 11
+!elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900
+VSVER = 12
+!else
+VSVER = 0
+!endif
+
+!if "$(VSVER)" == "0"
+MSG = ^
+This NMake Makefile set supports Visual Studio^
+9 (2008) through 12 (2013).  Your Visual Studio^
+version is not supported.
+!error $(MSG)
+!endif
+
+VALID_CFGSET = FALSE
+!if "$(CFG)" == "release" || "$(CFG)" == "debug"
+VALID_CFGSET = TRUE
+!endif
+
+!if "$(CFG)" == "release"
+CFLAGS_ADD = /MD /O2
+!else
+CFLAGS_ADD = /MDd /Od /Zi
+!endif
+
+!if "$(PLAT)" == "x64"
+LDFLAGS_ARCH = /machine:x64
+!else
+LDFLAGS_ARCH = /machine:x86
+!endif
+
+LD = link.exe
+LD_CFLAGS = /link
+EXEEXT = .exe
+GLIB_LIBS = gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib
+
+PANGO_API_VERSION = 1.0
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index 0823c59..9071df6 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -1,8 +1,6 @@
 SUBDIRS = vs9 vs10
 
 EXTRA_DIST =   \
-       unistd.h        \
-       gen-file-list-pango.py  \
-       gengir_pango.bat
+       unistd.h
 
 -include $(top_srcdir)/git.mk
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index cd17417..dec3004 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -1,7 +1,6 @@
 EXTRA_DIST =   \
        pango.sln       \
        pango-build-defines.props       \
-       pango-gengir.props      \
        pango-ignore-fc.props   \
        pango-install-bin.props \
        pango-install.props     \
@@ -23,7 +22,6 @@ EXTRA_DIST =  \
        pangocairo.vcxprojin    \
        pangocairo.vcxproj.filtersin    \
        install.vcxproj \
-       gengir.vcxproj  \
        README.txt
 
 pango-install.props: $(top_srcdir)/build/win32/vs10/pango-install.propsin pango.vs10.headers
diff --git a/build/win32/vs10/pango.sln b/build/win32/vs10/pango.sln
index 4917ae2..8074bfc 100644
--- a/build/win32/vs10/pango.sln
+++ b/build/win32/vs10/pango.sln
@@ -10,8 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pangocairo", "pangocairo.vc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", 
"{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcxproj", 
"{2093D218-190E-4194-9421-3BA7CBF33B15}"
-EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug_FC|Win32 = Debug_FC|Win32
@@ -100,14 +98,6 @@ Global
                {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_FC|Win32.Build.0 = Release_FC|Win32
                {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_FC|x64.ActiveCfg = Release_FC|x64
                {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_FC|x64.Build.0 = Release_FC|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_FC|Win32.ActiveCfg = Debug|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_FC|x64.ActiveCfg = Debug|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Release_FC|Win32.ActiveCfg = Release|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Release_FC|x64.ActiveCfg = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index eb8189b..71b6a7f 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -1,7 +1,6 @@
 EXTRA_DIST =   \
        pango.sln       \
        pango-build-defines.vsprops     \
-       pango-gengir.vsprops    \
        pango-ignore-fc.vsprops \
        pango-install-bin.vsprops       \
        pango-install.vsprops   \
@@ -17,7 +16,6 @@ EXTRA_DIST =  \
        pangowin32.vcproj       \
        install.vcproj  \
        stdint.h        \
-       gengir.vcproj   \
        README.txt
 
 pango-install.vsprops: $(top_srcdir)/build/win32/vs9/pango-install.vspropsin pango.vs9.headers
diff --git a/build/win32/vs9/pango.sln b/build/win32/vs9/pango.sln
index ec40845..e6cf2d6 100644
--- a/build/win32/vs9/pango.sln
+++ b/build/win32/vs9/pango.sln
@@ -27,12 +27,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj",
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcproj", 
"{2093D218-190E-4194-9421-3BA7CBF33B15}"
-       ProjectSection(ProjectDependencies) = postProject
-               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
-               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}
-       EndProjectSection
-EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -121,14 +115,6 @@ Global
                {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_FC|Win32.Build.0 = Release_FC|Win32
                {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_FC|x64.ActiveCfg = Release_FC|x64
                {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release_FC|x64.Build.0 = Release_FC|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_FC|Win32.ActiveCfg = Debug|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug_FC|x64.ActiveCfg = Debug|x64
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Release_FC|Win32.ActiveCfg = Release|Win32
-               {2093D218-190E-4194-9421-3BA7CBF33B15}.Release_FC|x64.ActiveCfg = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]