Various Visual C++ support updates
authorChun-wei Fan <fanchunwei@src.gnome.org>
Mon, 16 May 2011 09:52:41 +0000 (17:52 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Mon, 16 May 2011 09:52:41 +0000 (17:52 +0800)
-Move the stub stdint.h back into the vs9 folder as stdint.h is shipped
 with Visual C++ 2010, and update the corresponding Makefile.am's
 accordingly
-Add new solution to build Pango with FontConfig-the former solution file
 will build Pango without FontConfig.  This is to simplify the use
 of the GTK+ stack as many will probably not use FontConfig on Windows,
 therefore this is to reduce the number of dependencies
-Added configurations in Pango, PangoWin32, PangoCairo regarding FontConfig
 (To make sure their configurations are consistent across the board)
-Cleaned up the various project files for a bit.

build/win32/Makefile.am
build/win32/vs9/Makefile.am
build/win32/vs9/install.vcproj
build/win32/vs9/pango.sln
build/win32/vs9/pango.vcprojin
build/win32/vs9/pango.vsprops
build/win32/vs9/pango_fc.sln [new file with mode: 0644]
build/win32/vs9/pangocairo.vcprojin
build/win32/vs9/pangoft2.vcprojin
build/win32/vs9/pangowin32.vcproj
build/win32/vs9/stdint.h [moved from build/win32/stdint.h with 100% similarity]

index 9c0d1b0..b75548b 100644 (file)
@@ -1,3 +1,3 @@
 SUBDIRS = vs9
 
-EXTRA_DIST = stdint.h unistd.h
+EXTRA_DIST = unistd.h
index 88ec980..47cad7d 100644 (file)
@@ -1,5 +1,6 @@
 EXTRA_DIST = \
        pango.sln \
+       pango_fc.sln \
        pango.vsprops \
        pango.vcprojin \
        pango.vcproj \
@@ -8,4 +9,5 @@ EXTRA_DIST = \
        pangowin32.vcproj \
        pangocairo.vcprojin \
        pangocairo.vcproj \
-       install.vcproj
+       install.vcproj  \
+       stdint.h
index 3b9dad6..fd8d64d 100644 (file)
        </ToolFiles>
        <Configurations>
                <Configuration
+                       Name="Debug_FC|Win32"
+                       OutputDirectory="$(GlibEtcInstallRoot)"
+                       ConfigurationType="10"
+                       InheritedPropertySheets=".\pango.vsprops"
+                       CharacterSet="2"
+                       DeleteExtensionsOnClean=""
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                               CommandLine="$(PangoDoInstall) $(PangoInstallFCHeaders)"
+                       />
+               </Configuration>
+               <Configuration
                        Name="Debug|Win32"
+                       OutputDirectory="$(GlibEtcInstallRoot)"
+                       ConfigurationType="10"
                        InheritedPropertySheets=".\pango.vsprops"
+                       CharacterSet="2"
+                       DeleteExtensionsOnClean=""
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                               CommandLine="$(PangoDoInstall)"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release_FC|Win32"
                        OutputDirectory="$(GlibEtcInstallRoot)"
-                       
-ConfigurationType="10"
+                       ConfigurationType="10"
+                       InheritedPropertySheets=".\pango.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
+                       WholeProgramOptimization="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                               CommandLine="$(PangoDoInstall) $(PangoInstallFCHeaders)"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(GlibEtcInstallRoot)"
+                       ConfigurationType="10"
+                       InheritedPropertySheets=".\pango.vsprops"
+                       CharacterSet="2"
+                       DeleteExtensionsOnClean=""
+                       WholeProgramOptimization="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -34,6 +74,19 @@ ConfigurationType="10"
                        />
                </Configuration>
                <Configuration
+                       Name="Debug_FC|x64"
+                       InheritedPropertySheets=".\pango.vsprops"
+                       OutputDirectory="$(GlibEtcInstallRoot)"
+                       ConfigurationType="10"
+                       CharacterSet="2"
+                       DeleteExtensionsOnClean=""
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                               CommandLine="$(PangoDoInstall) $(PangoInstallFCHeaders)"
+                       />
+               </Configuration>
+               <Configuration
                        Name="Debug|x64"
                        InheritedPropertySheets=".\pango.vsprops"
                        OutputDirectory="$(GlibEtcInstallRoot)"
@@ -47,7 +100,7 @@ ConfigurationType="10"
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Release_FC|x64"
                        InheritedPropertySheets=".\pango.vsprops"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
@@ -57,7 +110,7 @@ ConfigurationType="10"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               CommandLine="$(PangoDoInstall)"
+                               CommandLine="$(PangoDoInstall) $(PangoInstallFCHeaders)"
                        />
                </Configuration>
                <Configuration
@@ -75,4 +128,10 @@ ConfigurationType="10"
                        />
                </Configuration>
        </Configurations>
+       <References>
+       </References>
+       <Files>
+       </Files>
+       <Globals>
+       </Globals>
 </VisualStudioProject>
index ededa74..070f3ed 100644 (file)
@@ -2,11 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pango", "pango.vcproj", "{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pangoft2", "pangoft2.vcproj", "{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}"
-       ProjectSection(ProjectDependencies) = postProject
-               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
-       EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pangowin32", "pangowin32.vcproj", "{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}"
        ProjectSection(ProjectDependencies) = postProject
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
@@ -15,15 +10,14 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pangocairo", "pangocairo.vcproj", "{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}"
        ProjectSection(ProjectDependencies) = postProject
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
-               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
        ProjectSection(ProjectDependencies) = postProject
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
-               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}
        EndProjectSection
 EndProject
 Global
@@ -42,14 +36,6 @@ Global
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release|Win32.Build.0 = Release|Win32
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release|x64.ActiveCfg = Release|x64
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release|x64.Build.0 = Release|x64
-               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug|Win32.ActiveCfg = Debug|Win32
-               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug|Win32.Build.0 = Debug|Win32
-               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug|x64.ActiveCfg = Debug|x64
-               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug|x64.Build.0 = Debug|x64
-               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release|Win32.ActiveCfg = Release|Win32
-               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release|Win32.Build.0 = Release|Win32
-               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release|x64.ActiveCfg = Release|x64
-               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release|x64.Build.0 = Release|x64
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug|Win32.ActiveCfg = Debug|Win32
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug|Win32.Build.0 = Debug|Win32
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug|x64.ActiveCfg = Debug|x64
@@ -59,9 +45,11 @@ Global
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release|x64.ActiveCfg = Release|x64
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release|x64.Build.0 = Release|x64
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug|Win32.ActiveCfg = Debug|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug|Win32.Build.0 = Debug|Win32
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug|x64.ActiveCfg = Debug|x64
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug|x64.Build.0 = Debug|x64
-               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release|Win32.ActiveCfg = Release|x64
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release|Win32.ActiveCfg = Release|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release|Win32.Build.0 = Release|Win32
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release|x64.ActiveCfg = Release|x64
                {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release|x64.Build.0 = Release|x64
                {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.ActiveCfg = Debug|Win32
index ad7db04..7c36731 100644 (file)
        </Platforms>
        <Configurations>
                <Configuration
-                       Name="Debug|Win32"
-                       InheritedPropertySheets=".\pango.vsprops"
+                       Name="Debug_FC|Win32"
                        ConfigurationType="2"
+                       InheritedPropertySheets=".\pango.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Debug|Win32"
+                       ConfigurationType="2"
                        InheritedPropertySheets=".\pango.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(NoFCDef)"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="4"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
+                               LinkIncremental="2"
+                               ModuleDefinitionFile="..\..\..\pango\pango.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
+                               TargetMachine="1"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release_FC|Win32"
                        ConfigurationType="2"
+                       InheritedPropertySheets=".\pango.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
                                Name="VCCLCompilerTool"
                                PreprocessorDefinitions="$(PangoDefines)"
                                RuntimeLibrary="2"
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
+                       Name="Release|Win32"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\pango.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               PreprocessorDefinitions="$(PangoDefines);$(NoFCDef)"
+                               RuntimeLibrary="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
+                               LinkIncremental="2"
+                               ModuleDefinitionFile="..\..\..\pango\pango.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
+                               TargetMachine="1"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug_FC|x64"
                        InheritedPropertySheets=".\pango.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        />
                </Configuration>
                <Configuration
-                       Name="Release|x64"
+                       Name="Debug|x64"
+                       InheritedPropertySheets=".\pango.vsprops"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(NoFCDef)"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
+                               LinkIncremental="2"
+                               ModuleDefinitionFile="..\..\..\pango\pango.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
+                               TargetMachine="17"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release_FC|x64"
                        InheritedPropertySheets=".\pango.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                                TargetMachine="17"
                        />
                </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       InheritedPropertySheets=".\pango.vsprops"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               PreprocessorDefinitions="$(PangoDefines);$(NoFCDef)"
+                               RuntimeLibrary="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
+                               LinkIncremental="2"
+                               ModuleDefinitionFile="..\..\..\pango\pango.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
+                               TargetMachine="17"
+                       />
+               </Configuration>
        </Configurations>
        <References>
        </References>
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\..\modules\arabic\arabic-lang.c">
-                               <FileConfiguration Name="Debug|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Debug|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang"
-                                       />
-                               </FileConfiguration>
+                       <File RelativePath="..\..\..\modules\arabic\arabic-lang.c" >
+                               <FileConfiguration Name="Debug_FC|Win32"><Tool Name="VCCLCompilerTool"  PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang" /></FileConfiguration>
+                               <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool"     PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang" /></FileConfiguration>
+                               <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang" /></FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang" /></FileConfiguration>
+                               <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang" /></FileConfiguration>
+                               <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang" /></FileConfiguration>
                        </File>
-                       <File RelativePath="..\..\..\modules\indic\indic-lang.c">
-                               <FileConfiguration Name="Debug|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Debug|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang"
-                                       />
-                               </FileConfiguration>
+                       <File RelativePath="..\..\..\modules\indic\indic-lang.c" >
+                               <FileConfiguration Name="Debug_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang" /></FileConfiguration>
+                               <FileConfiguration Name="Debug|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang" /></FileConfiguration>
+                               <FileConfiguration Name="Release|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang" /></FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang" /></FileConfiguration>
+                               <FileConfiguration Name="Debug|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang" /></FileConfiguration>
+                               <FileConfiguration Name="Release|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang" /></FileConfiguration>
                        </File>
 #include "libpango.sourcefiles"
 #include "mini-fribidi/libmini-fribidi.sourcefiles"
index ce6255e..59ad903 100644 (file)
@@ -62,6 +62,10 @@ copy ..\..\..\pango\module-defs-win32.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_WI
                Value="G_LOG_DOMAIN=\&quot;Pango\&quot;;PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE;SYSCONFDIR=\&quot;$(PangoDummyPrefix)/etc\&quot;;LIBDIR=\&quot;$(PangoDummyPrefix)/lib\&quot;"
        />
        <UserMacro
+               Name="NoFCDef"
+               Value="PANGO_VISUALC_NO_FC"
+       />
+       <UserMacro
                Name="PangoDoInstall"
                Value="
 echo on&#x0D;&#x0A;
@@ -100,11 +104,16 @@ copy ..\..\..\pango\pango-tabs.h $(OutDir)\include\pango-$(PangoApiVersion)\pang
 copy ..\..\..\pango\pango-types.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
 copy ..\..\..\pango\pango-utils.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
 copy ..\..\..\pango\pangocairo.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
+copy ..\..\..\pango\pangowin32.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
+"
+       />
+       <UserMacro
+               Name="PangoInstallFCHeaders"
+               Value="
 copy ..\..\..\pango\pangofc-decoder.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
 copy ..\..\..\pango\pangofc-font.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
 copy ..\..\..\pango\pangofc-fontmap.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
 copy ..\..\..\pango\pangoft2.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pangowin32.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
 "
        />
        <UserMacro
diff --git a/build/win32/vs9/pango_fc.sln b/build/win32/vs9/pango_fc.sln
new file mode 100644 (file)
index 0000000..6660ca1
--- /dev/null
@@ -0,0 +1,82 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pango", "pango.vcproj", "{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pangoft2", "pangoft2.vcproj", "{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}"
+       ProjectSection(ProjectDependencies) = postProject
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pangowin32", "pangowin32.vcproj", "{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}"
+       ProjectSection(ProjectDependencies) = postProject
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pangocairo", "pangocairo.vcproj", "{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}"
+       ProjectSection(ProjectDependencies) = postProject
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
+       ProjectSection(ProjectDependencies) = postProject
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}
+       EndProjectSection
+EndProject
+Global
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution
+               Debug|Win32 = Debug|Win32
+               Debug|x64 = Debug|x64
+               Release|Win32 = Release|Win32
+               Release|x64 = Release|x64
+       EndGlobalSection
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Debug|Win32.ActiveCfg = Debug_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Debug|Win32.Build.0 = Debug_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Debug|x64.ActiveCfg = Debug_FC|x64
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Debug|x64.Build.0 = Debug_FC|x64
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release|Win32.ActiveCfg = Release_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release|Win32.Build.0 = Release_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release|x64.ActiveCfg = Release_FC|x64
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release|x64.Build.0 = Release_FC|x64
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug|Win32.ActiveCfg = Debug_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug|Win32.Build.0 = Debug_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug|x64.ActiveCfg = Debug_FC|x64
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug|x64.Build.0 = Debug_FC|x64
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release|Win32.ActiveCfg = Release_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release|Win32.Build.0 = Release_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release|x64.ActiveCfg = Release_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release|x64.Build.0 = Release_FC|x64
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug|Win32.ActiveCfg = Debug_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug|Win32.Build.0 = Debug_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug|x64.ActiveCfg = Debug_FC|x64
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug|x64.Build.0 = Debug_FC|x64
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release|Win32.ActiveCfg = Release_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release|Win32.Build.0 = Release_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release|x64.ActiveCfg = Release_FC|x64
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release|x64.Build.0 = Release_FC|x64
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug|Win32.ActiveCfg = Debug_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug|Win32.Build.0 = Debug_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug|x64.ActiveCfg = Debug_FC|x64
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug|x64.Build.0 = Debug_FC|x64
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release|Win32.ActiveCfg = Release_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release|Win32.Build.0 = Release_FC|Win32
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release|x64.ActiveCfg = Release_FC|x64
+               {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release|x64.Build.0 = Release_FC|x64
+               {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.ActiveCfg = Debug_FC|Win32
+               {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.Build.0 = Debug_FC|Win32
+               {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.ActiveCfg = Debug_FC|x64
+               {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.Build.0 = Debug_FC|x64
+               {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.ActiveCfg = Release_FC|Win32
+               {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.Build.0 = Release_FC|Win32
+               {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.ActiveCfg = Release_FC|x64
+               {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.Build.0 = Release_FC|x64
+       EndGlobalSection
+       GlobalSection(SolutionProperties) = preSolution
+               HideSolutionNode = FALSE
+       EndGlobalSection
+EndGlobal
index 8b30b3e..ed2c442 100644 (file)
        </Platforms>
        <Configurations>
                <Configuration
-                       Name="Debug|Win32"
-                       InheritedPropertySheets=".\pango.vsprops"
+                       Name="Debug_FC|Win32"
                        ConfigurationType="2"
+                       InheritedPropertySheets=".\pango.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="."
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Debug|Win32"
+                       ConfigurationType="2"
                        InheritedPropertySheets=".\pango.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="."
+                               PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(NoFCDef)"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="4"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="cairo.lib"
+                               OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
+                               LinkIncremental="2"
+                               IgnoreDefaultLibraryNames="$(OutDir)\pangoft2-$(PangoApiVersion).lib"
+                               ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
+                               TargetMachine="1"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release_FC|Win32"
                        ConfigurationType="2"
+                       InheritedPropertySheets=".\pango.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="."
                                PreprocessorDefinitions="$(PangoDefines)"
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
+                       Name="Release|Win32"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\pango.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="."
+                               PreprocessorDefinitions="$(PangoDefines);$(NoFCDef)"
+                               RuntimeLibrary="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="cairo.lib"
+                               OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
+                               LinkIncremental="2"
+                               IgnoreDefaultLibraryNames="$(OutDir)\pangoft2-$(PangoApiVersion).lib"
+                               ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
+                               TargetMachine="1"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug_FC|x64"
                        InheritedPropertySheets=".\pango.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        />
                </Configuration>
                <Configuration
-                       Name="Release|x64"
+                       Name="Debug|x64"
+                       InheritedPropertySheets=".\pango.vsprops"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="."
+                               PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(NoFCDef)"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="cairo.lib"
+                               OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
+                               LinkIncremental="2"
+                               IgnoreDefaultLibraryNames="$(OutDir)\pangoft2-$(PangoApiVersion).lib"
+                               ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
+                               TargetMachine="17"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release_FC|x64"
                        InheritedPropertySheets=".\pango.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                                TargetMachine="17"
                        />
                </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       InheritedPropertySheets=".\pango.vsprops"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="."
+                               PreprocessorDefinitions="$(PangoDefines);$(NoFCDef)"
+                               RuntimeLibrary="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="cairo.lib"
+                               OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
+                               LinkIncremental="2"
+                               ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
+                               TargetMachine="17"
+                       />
+               </Configuration>
        </Configurations>
        <References>
        </References>
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-                       <File RelativePath="..\..\..\pango\pangocairo-fcfont.c" />
-                       <File RelativePath="..\..\..\pango\pangocairo-fcfontmap.c" />
+                       <File RelativePath="..\..\..\pango\pangocairo-fcfont.c" >
+                               <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                               <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                               <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                               <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                       </File>
+                       <File RelativePath="..\..\..\pango\pangocairo-fcfontmap.c" >
+                               <FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                               <FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                               <FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                               <FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
+                       </File>
                        <File RelativePath="..\..\..\pango\pangocairo-win32font.c" />
                        <File RelativePath="..\..\..\pango\pangocairo-win32fontmap.c" />
 #include "libpangocairo.sourcefiles"
index 91de952..12beb15 100644 (file)
        </ToolFiles>
        <Configurations>
                <Configuration
-                       Name="Debug|Win32"
-                       InheritedPropertySheets=".\pango.vsprops"
+                       Name="Debug_FC|Win32"
                        ConfigurationType="2"
+                       InheritedPropertySheets=".\pango.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\"
+                               AdditionalIncludeDirectories=".;..\"
                                PreprocessorDefinitions="_DEBUG;$(PangoDefines);HAVE_GLIB"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
-                       InheritedPropertySheets=".\pango.vsprops"
+                       Name="Release_FC|Win32"
                        ConfigurationType="2"
+                       InheritedPropertySheets=".\pango.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\"
+                               AdditionalIncludeDirectories=".;..\"
                                PreprocessorDefinitions="$(PangoDefines);HAVE_GLIB"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
@@ -79,7 +85,7 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
+                       Name="Debug_FC|x64"
                        InheritedPropertySheets=".\pango.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
@@ -87,7 +93,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\"
+                               AdditionalIncludeDirectories=".;..\"
                                PreprocessorDefinitions="_DEBUG;$(PangoDefines);HAVE_GLIB"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                        />
                </Configuration>
                <Configuration
-                       Name="Release|x64"
+                       Name="Release_FC|x64"
                        InheritedPropertySheets=".\pango.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="..\"
+                               AdditionalIncludeDirectories=".;..\"
                                PreprocessorDefinitions="$(PangoDefines);HAVE_GLIB"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
                        <File RelativePath="..\..\..\modules\arabic\arabic-fc.c">
-                               <FileConfiguration Name="Debug|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Debug|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc"
-                                       />
-                               </FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc" /></FileConfiguration>
                        </File>
                        <File RelativePath="..\..\..\modules\arabic\arabic-ot.c" />
                        <File RelativePath="..\..\..\modules\basic\basic-fc.c">
-                               <FileConfiguration Name="Debug|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Debug|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc"
-                                       />
-                               </FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc" /></FileConfiguration>
                        </File>
                        <File RelativePath="..\..\..\modules\hangul\hangul-fc.c">
-                               <FileConfiguration Name="Debug|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Debug|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc"
-                                       />
-                               </FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc" /></FileConfiguration>
                        </File>
                        <File RelativePath="..\..\..\modules\hebrew\hebrew-fc.c">
-                               <FileConfiguration Name="Debug|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Debug|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc"
-                                       />
-                               </FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc" /></FileConfiguration>
                        </File>
                        <File RelativePath="..\..\..\modules\hebrew\hebrew-shaper.c" />
                        <File RelativePath="..\..\..\modules\indic\indic-fc.c">
-                               <FileConfiguration Name="Debug|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Debug|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc"
-                                       />
-                               </FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc" /></FileConfiguration>
                        </File>
-                       <File RelativePath="..\..\..\modules\indic\indic-ot.c" />
                        <File RelativePath="..\..\..\modules\indic\indic-ot-class-tables.c" />
+                       <File RelativePath="..\..\..\modules\indic\indic-ot.c" />
                        <File RelativePath="..\..\..\modules\indic\mprefixups.c" />
                        <File RelativePath="..\..\..\modules\khmer\khmer-fc.c">
-                               <FileConfiguration Name="Debug|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Debug|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc"
-                                       />
-                               </FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc" /></FileConfiguration>
                        </File>
                        <File RelativePath="..\..\..\modules\syriac\syriac-fc.c">
-                               <FileConfiguration Name="Debug|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Debug|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc"
-                                       />
-                               </FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc" /></FileConfiguration>
                        </File>
                        <File RelativePath="..\..\..\modules\syriac\syriac-ot.c" />
                        <File RelativePath="..\..\..\modules\thai\thai-charprop.c" />
                        <File RelativePath="..\..\..\modules\thai\thai-fc.c">
-                               <FileConfiguration Name="Debug|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Debug|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc"
-                                       />
-                               </FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc" /></FileConfiguration>
                        </File>
                        <File RelativePath="..\..\..\modules\thai\thai-shaper.c" />
                        <File RelativePath="..\..\..\modules\tibetan\tibetan-fc.c">
-                               <FileConfiguration Name="Debug|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Debug|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|Win32">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration Name="Release|x64">
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc"
-                                       />
-                               </FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|Win32"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Debug_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc" /></FileConfiguration>
+                               <FileConfiguration Name="Release_FC|x64"><Tool Name="VCCLCompilerTool" PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc" /></FileConfiguration>
                        </File>
 #include "opentype/libharfbuzz.sourcefiles"
 #include "libpangoft2.sourcefiles"
index 27a6355..ce34ae7 100644 (file)
        </ToolFiles>
        <Configurations>
                <Configuration
-                       Name="Debug|Win32"
-                       InheritedPropertySheets=".\pango.vsprops"
+                       Name="Debug_FC|Win32"
                        ConfigurationType="2"
+                       InheritedPropertySheets=".\pango.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="."
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
+                       Name="Debug|Win32"
+                       ConfigurationType="2"
                        InheritedPropertySheets=".\pango.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="."
+                               PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(NoFCDef)"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="4"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="usp10.lib"
+                               OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
+                               LinkIncremental="2"
+                               ModuleDefinitionFile="..\..\..\pango\pangowin32.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
+                               TargetMachine="1"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release_FC|Win32"
                        ConfigurationType="2"
+                       InheritedPropertySheets=".\pango.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
                                Name="VCCLCompilerTool"
                                PreprocessorDefinitions="$(PangoDefines)"
                                RuntimeLibrary="2"
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
+                       Name="Release|Win32"
+                       ConfigurationType="2"
+                       InheritedPropertySheets=".\pango.vsprops"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               PreprocessorDefinitions="$(PangoDefines);$(NoFCDef)"
+                               RuntimeLibrary="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="usp10.lib"
+                               OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
+                               LinkIncremental="2"
+                               ModuleDefinitionFile="..\..\..\pango\pangowin32.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
+                               TargetMachine="1"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug_FC|x64"
                        InheritedPropertySheets=".\pango.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        />
                </Configuration>
                <Configuration
-                       Name="Release|x64"
+                       Name="Debug|x64"
+                       InheritedPropertySheets=".\pango.vsprops"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(NoFCDef)"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="usp10.lib"
+                               OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
+                               LinkIncremental="2"
+                               ModuleDefinitionFile="..\..\..\pango\pangowin32.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
+                               TargetMachine="17"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release_FC|x64"
                        InheritedPropertySheets=".\pango.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                                TargetMachine="17"
                        />
                </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       InheritedPropertySheets=".\pango.vsprops"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               PreprocessorDefinitions="$(PangoDefines);$(NoFCDef)"
+                               RuntimeLibrary="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="usp10.lib"
+                               OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
+                               LinkIncremental="2"
+                               ModuleDefinitionFile="..\..\..\pango\pangowin32.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
+                               TargetMachine="17"
+                       />
+               </Configuration>
        </Configurations>
        <References>
        </References>
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
                        >
-                       <File
-                               RelativePath="..\..\..\pango\pangowin32.rc"
-                               >
-                       </File>
+                       <File RelativePath="..\..\..\pango\pangowin32.rc" />
                </Filter>
                <Filter
                        Name="Source Files"
                        >
                        <File RelativePath="..\..\..\modules\basic\basic-win32.c" />
                        <File RelativePath="..\..\..\pango\module-defs-win32.c" />
-                       <File RelativePath="..\..\..\pango\pangowin32.c" />
                        <File RelativePath="..\..\..\pango\pangowin32-fontcache.c" />
                        <File RelativePath="..\..\..\pango\pangowin32-fontmap.c" />
+                       <File RelativePath="..\..\..\pango\pangowin32.c" />
                </Filter>
        </Files>
+       <Globals>
+       </Globals>
 </VisualStudioProject>