[pango] MSVC builds: Update PangoFT2-related items

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [pango] MSVC builds: Update PangoFT2-related items
Date: Thu, 8 Oct 2015 10:36:19 +0000 (UTC)
commit 18fe29478c263cf57ed408b153a76f30a934261d
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Oct 8 18:36:05 2015 +0800

    MSVC builds: Update PangoFT2-related items
    
    Fix the projects, and consolidate repeated items into the property sheets,
    as they now need to compile and link against HarfBuzz.  Also remove
    unnecessary lines from the PangoFT2 and PangoCairo project files.

 build/win32/vs10/pango-build-defines.props  |   10 +++++++++-
 build/win32/vs10/pangocairo.vcxprojin       |   16 ++++------------
 build/win32/vs10/pangoft2.vcxprojin         |   24 ++++++++++++------------
 build/win32/vs9/pango-build-defines.vsprops |   14 +++++++++++++-
 build/win32/vs9/pangocairo.vcprojin         |   25 +++++++++----------------
 build/win32/vs9/pangoft2.vcprojin           |   24 ++++++++++++------------
 6 files changed, 59 insertions(+), 54 deletions(-)
---
diff --git a/build/win32/vs10/pango-build-defines.props b/build/win32/vs10/pango-build-defines.props
index cc55e95..89b8b9a 100644
--- a/build/win32/vs10/pango-build-defines.props
+++ b/build/win32/vs10/pango-build-defines.props
@@ -8,6 +8,8 @@
     <PangoDummyPrefix>/dummy</PangoDummyPrefix>
     
<PangoDefines>G_LOG_DOMAIN="Pango";PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE;SYSCONFDIR="$(PangoDummyPrefix)/etc";LIBDIR="$(PangoDummyPrefix)/lib"</PangoDefines>
     <NoFCDef>PANGO_VISUALC_NO_FC</NoFCDef>
+    <PangoFT2Incs>..;$(GlibEtcInstallRoot)\include\harfbuzz</PangoFT2Incs>
+    <PangoFT2Libs>fontconfig.lib;freetype.lib;harfbuzz.lib</PangoFT2Libs>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>pangobuilddefinesprops</_PropertySheetDisplayName>
@@ -41,5 +43,11 @@
     <BuildMacro Include="NoFCDef">
       <Value>$(NoFCDef)</Value>
     </BuildMacro>
+    <BuildMacro Include="PangoFT2Incs">
+      <Value>$(PangoFT2Incs)</Value>
+    </BuildMacro>
+    <BuildMacro Include="PangoFT2Libs">
+      <Value>$(PangoFT2Libs)</Value>
+    </BuildMacro>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs10/pangocairo.vcxprojin b/build/win32/vs10/pangocairo.vcxprojin
index 3ce0eff..304cb0d 100644
--- a/build/win32/vs10/pangocairo.vcxprojin
+++ b/build/win32/vs10/pangocairo.vcxprojin
@@ -137,7 +137,6 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       
<PreprocessorDefinitions>_DEBUG;$(PangoDefines);$(NoFCDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -160,7 +159,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       
<PreprocessorDefinitions>$(PangoDefines);$(NoFCDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -184,7 +182,6 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       
<PreprocessorDefinitions>_DEBUG;$(PangoDefines);$(NoFCDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -207,7 +204,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       
<PreprocessorDefinitions>$(PangoDefines);$(NoFCDef);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -230,7 +226,6 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;$(PangoDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -241,7 +236,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      
<AdditionalDependencies>cairo.lib;fontconfig.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cairo.lib;$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -252,7 +247,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(PangoDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -261,7 +255,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      
<AdditionalDependencies>cairo.lib;fontconfig.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cairo.lib;$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -275,7 +269,6 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;$(PangoDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -286,7 +279,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      
<AdditionalDependencies>cairo.lib;fontconfig.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cairo.lib;$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -297,7 +290,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>$(PangoDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -306,7 +298,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      
<AdditionalDependencies>cairo.lib;fontconfig.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cairo.lib;$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>..\..\..\pango\pangocairo.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/build/win32/vs10/pangoft2.vcxprojin b/build/win32/vs10/pangoft2.vcxprojin
index d1b5786..802b497 100644
--- a/build/win32/vs10/pangoft2.vcxprojin
+++ b/build/win32/vs10/pangoft2.vcxprojin
@@ -75,8 +75,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>_DEBUG;$(PangoDefines);HAVE_GLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<AdditionalIncludeDirectories>$(PangoFT2Incs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(PangoDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -86,7 +86,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>fontconfig.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>..\..\..\pango\pangoft2.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -97,8 +97,8 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(PangoDefines);HAVE_GLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<AdditionalIncludeDirectories>$(PangoFT2Incs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(PangoDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -106,7 +106,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>fontconfig.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>..\..\..\pango\pangoft2.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -120,8 +120,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>_DEBUG;$(PangoDefines);HAVE_GLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<AdditionalIncludeDirectories>$(PangoFT2Incs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;$(PangoDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -131,7 +131,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>fontconfig.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>..\..\..\pango\pangoft2.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -142,8 +142,8 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(PangoDefines);HAVE_GLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<AdditionalIncludeDirectories>$(PangoFT2Incs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>$(PangoDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -151,7 +151,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>fontconfig.lib;freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(PangoFT2Libs);%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>..\..\..\pango\pangoft2.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/build/win32/vs9/pango-build-defines.vsprops b/build/win32/vs9/pango-build-defines.vsprops
index 7eeac94..ed892a7 100644
--- a/build/win32/vs9/pango-build-defines.vsprops
+++ b/build/win32/vs9/pango-build-defines.vsprops
@@ -35,4 +35,16 @@
                Name="NoFCDef"
                Value="PANGO_VISUALC_NO_FC"
        />
-</VisualStudioPropertySheet>
\ No newline at end of file
+       <UserMacro
+               Name="PangoFT2Incs"
+               Value=".;..;$(GlibEtcInstallRoot)\include\harfbuzz"
+       />
+       <UserMacro
+               Name="PangoFT2CFlags"
+               Value="HAVE_STDINT_H=1"
+       />
+       <UserMacro
+               Name="PangoFT2Libs"
+               Value="fontconfig.lib freetype.lib harfbuzz.lib"
+       />
+</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/pangocairo.vcprojin b/build/win32/vs9/pangocairo.vcprojin
index 3ee818d..e4b3272 100644
--- a/build/win32/vs9/pangocairo.vcprojin
+++ b/build/win32/vs9/pangocairo.vcprojin
@@ -29,7 +29,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="."
+                               AdditionalIncludeDirectories="$(PangoFT2Incs)"
                                PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -40,7 +40,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="cairo.lib fontconfig.lib freetype.lib"
+                               AdditionalDependencies="cairo.lib $(PangoFT2Libs)"
                                OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
                                LinkIncremental="2"
                                ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
@@ -62,7 +62,6 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="."
                                PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(NoFCDef)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -95,7 +94,7 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="."
+                               AdditionalIncludeDirectories="$(PangoFT2Incs)"
                                PreprocessorDefinitions="$(PangoDefines)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
@@ -104,7 +103,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="cairo.lib fontconfig.lib freetype.lib"
+                               AdditionalDependencies="cairo.lib $(PangoFT2Libs)"
                                OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
@@ -127,7 +126,6 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="."
                                PreprocessorDefinitions="$(PangoDefines);$(NoFCDef)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
@@ -158,7 +156,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="."
+                               AdditionalIncludeDirectories="$(PangoFT2Incs)"
                                PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -169,7 +167,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="cairo.lib fontconfig.lib freetype.lib"
+                               AdditionalDependencies="cairo.lib $(PangoFT2Libs)"
                                OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
                                LinkIncremental="2"
                                ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
@@ -188,7 +186,6 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="."
                                PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(NoFCDef)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -218,7 +215,7 @@
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="."
+                               AdditionalIncludeDirectories="$(PangoFT2Incs)"
                                PreprocessorDefinitions="$(PangoDefines)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
@@ -227,7 +224,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="cairo.lib fontconfig.lib freetype.lib"
+                               AdditionalDependencies="cairo.lib $(PangoFT2Libs)"
                                OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
@@ -247,7 +244,6 @@
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="."
                                PreprocessorDefinitions="$(PangoDefines);$(NoFCDef)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
@@ -283,10 +279,7 @@
                        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\pangocairo.rc"
-                               >
-                       </File>
+                       <File RelativePath="..\..\..\pango\pangocairo.rc" />
                </Filter>
                <Filter
                        Name="Source Files"
diff --git a/build/win32/vs9/pangoft2.vcprojin b/build/win32/vs9/pangoft2.vcprojin
index a6570dd..598d5a8 100644
--- a/build/win32/vs9/pangoft2.vcprojin
+++ b/build/win32/vs9/pangoft2.vcprojin
@@ -31,8 +31,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;..\"
-                               PreprocessorDefinitions="_DEBUG;$(PangoDefines);HAVE_GLIB;HAVE_STDINT_H=1"
+                               AdditionalIncludeDirectories="$(PangoFT2Incs)"
+                               PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(PangoFT2CFlags)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -42,7 +42,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="fontconfig.lib freetype.lib"
+                               AdditionalDependencies="$(PangoFT2Libs)"
                                OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
                                LinkIncremental="2"
                                ModuleDefinitionFile="..\..\..\pango\pangoft2.def"
@@ -63,8 +63,8 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories=".;..\"
-                               PreprocessorDefinitions="$(PangoDefines);HAVE_GLIB;HAVE_STDINT_H=1"
+                               AdditionalIncludeDirectories="$(PangoFT2Incs)"
+                               PreprocessorDefinitions="$(PangoDefines);$(PangoFT2CFlags)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -72,7 +72,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="fontconfig.lib freetype.lib"
+                               AdditionalDependencies="$(PangoFT2Libs)"
                                OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="..\..\..\pango\pangoft2.def"
@@ -93,8 +93,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;..\"
-                               PreprocessorDefinitions="_DEBUG;$(PangoDefines);HAVE_GLIB;HAVE_STDINT_H=1"
+                               AdditionalIncludeDirectories="$(PangoFT2Incs)"
+                               PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(PangoFT2CFlags)"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -104,7 +104,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="fontconfig.lib freetype.lib"
+                               AdditionalDependencies="$(PangoFT2Libs)"
                                OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
                                LinkIncremental="2"
                                ModuleDefinitionFile="..\..\..\pango\pangoft2.def"
@@ -122,8 +122,8 @@
                        >
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories=".;..\"
-                               PreprocessorDefinitions="$(PangoDefines);HAVE_GLIB;HAVE_STDINT_H=1"
+                               AdditionalIncludeDirectories="$(PangoFT2Incs)"
+                               PreprocessorDefinitions="$(PangoDefines);$(PangoFT2CFlags)"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
@@ -131,7 +131,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="fontconfig.lib freetype.lib"
+                               AdditionalDependencies="$(PangoFT2Libs)"
                                OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="..\..\..\pango\pangoft2.def"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]