summaryrefslogtreecommitdiff
path: root/build/win32/vs9
diff options
context:
space:
mode:
Diffstat (limited to 'build/win32/vs9')
-rw-r--r--build/win32/vs9/pango-build-defines.vsprops14
-rw-r--r--build/win32/vs9/pangocairo.vcprojin25
-rw-r--r--build/win32/vs9/pangoft2.vcprojin24
3 files changed, 34 insertions, 29 deletions
diff --git a/build/win32/vs9/pango-build-defines.vsprops b/build/win32/vs9/pango-build-defines.vsprops
index 7eeac94b..ed892a79 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 3ee818dc..e4b32729 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 a6570dd9..598d5a8d 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"
View Lorry Controller Status