diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-10-08 18:36:05 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-10-08 18:36:05 +0800 |
| commit | 18fe29478c263cf57ed408b153a76f30a934261d (patch) | |
| tree | 44d6c2f276fe6f71f2eb389a7f715716e0fbda59 /build/win32/vs9/pangocairo.vcprojin | |
| parent | 8f335578eb47fffb20647881622b994144054387 (diff) | |
| download | pango-18fe29478c263cf57ed408b153a76f30a934261d.tar.gz | |
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.
Diffstat (limited to 'build/win32/vs9/pangocairo.vcprojin')
| -rw-r--r-- | build/win32/vs9/pangocairo.vcprojin | 25 |
1 files changed, 9 insertions, 16 deletions
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" |