diff options
-rw-r--r-- | build/win32/vs10/pango-build-defines.props | 4 | ||||
-rw-r--r-- | build/win32/vs10/pangocairo.vcxprojin | 8 | ||||
-rw-r--r-- | build/win32/vs9/pango-build-defines.vsprops | 4 | ||||
-rw-r--r-- | build/win32/vs9/pangocairo.vcprojin | 12 |
4 files changed, 24 insertions, 4 deletions
diff --git a/build/win32/vs10/pango-build-defines.props b/build/win32/vs10/pango-build-defines.props index 2d4b34b1..f7756cb3 100644 --- a/build/win32/vs10/pango-build-defines.props +++ b/build/win32/vs10/pango-build-defines.props @@ -10,6 +10,7 @@ <NoFCDef>PANGO_VISUALC_NO_FC</NoFCDef> <PangoFT2Incs>..;$(GlibEtcInstallRoot)\include\harfbuzz</PangoFT2Incs> <PangoFT2Libs>fontconfig.lib;freetype.lib;harfbuzz.lib</PangoFT2Libs> + <PangoCairoIncs>$(GlibEtcInstallRoot)\include\cairo</PangoCairoIncs> </PropertyGroup> <PropertyGroup> <_PropertySheetDisplayName>pangobuilddefinesprops</_PropertySheetDisplayName> @@ -49,5 +50,8 @@ <BuildMacro Include="PangoFT2Libs"> <Value>$(PangoFT2Libs)</Value> </BuildMacro> + <BuildMacro Include="PangoCairoIncs"> + <Value>$(PangoCairoIncs)</Value> + </BuildMacro> </ItemGroup> </Project> diff --git a/build/win32/vs10/pangocairo.vcxprojin b/build/win32/vs10/pangocairo.vcxprojin index 1d9d04be..67f869c0 100644 --- a/build/win32/vs10/pangocairo.vcxprojin +++ b/build/win32/vs10/pangocairo.vcxprojin @@ -137,6 +137,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>$(PangoCairoIncs)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;$(PangoDefines);$(NoFCDef);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -159,6 +160,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> + <AdditionalIncludeDirectories>$(PangoCairoIncs)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>$(PangoDefines);$(NoFCDef);%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> @@ -182,6 +184,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>$(PangoCairoIncs)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;$(PangoDefines);$(NoFCDef);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -204,6 +207,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> + <AdditionalIncludeDirectories>$(PangoCairoIncs)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>$(PangoDefines);$(NoFCDef);%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> @@ -226,6 +230,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>$(PangoCairoIncs);$(PangoFT2Incs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;$(PangoDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -247,6 +252,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|Win32'"> <ClCompile> + <AdditionalIncludeDirectories>$(PangoCairoIncs);$(PangoFT2Incs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>$(PangoDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> @@ -269,6 +275,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_FC|x64'"> <ClCompile> <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>$(PangoCairoIncs);$(PangoFT2Incs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;$(PangoDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -290,6 +297,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_FC|x64'"> <ClCompile> + <AdditionalIncludeDirectories>$(PangoCairoIncs);$(PangoFT2Incs);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>$(PangoDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> diff --git a/build/win32/vs9/pango-build-defines.vsprops b/build/win32/vs9/pango-build-defines.vsprops index 8e1f9136..46325ee0 100644 --- a/build/win32/vs9/pango-build-defines.vsprops +++ b/build/win32/vs9/pango-build-defines.vsprops @@ -47,4 +47,8 @@ Name="PangoFT2Libs" Value="fontconfig.lib freetype.lib harfbuzz.lib" /> + <UserMacro + Name="PangoCairoIncs" + Value="$(GlibEtcInstallRoot)\include\cairo" + /> </VisualStudioPropertySheet> diff --git a/build/win32/vs9/pangocairo.vcprojin b/build/win32/vs9/pangocairo.vcprojin index e4b32729..59eba231 100644 --- a/build/win32/vs9/pangocairo.vcprojin +++ b/build/win32/vs9/pangocairo.vcprojin @@ -29,7 +29,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(PangoFT2Incs)" + AdditionalIncludeDirectories="$(PangoCairoIncs);$(PangoFT2Incs)" PreprocessorDefinitions="_DEBUG;$(PangoDefines)" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -62,6 +62,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" + AdditionalIncludeDirectories="$(PangoCairoIncs)" PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(NoFCDef)" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -94,7 +95,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(PangoFT2Incs)" + AdditionalIncludeDirectories="$(PangoCairoIncs);$(PangoFT2Incs)" PreprocessorDefinitions="$(PangoDefines)" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -126,6 +127,7 @@ /> <Tool Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(PangoCairoIncs)" PreprocessorDefinitions="$(PangoDefines);$(NoFCDef)" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -156,7 +158,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="$(PangoFT2Incs)" + AdditionalIncludeDirectories="$(PangoCairoIncs);$(PangoFT2Incs)" PreprocessorDefinitions="_DEBUG;$(PangoDefines)" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -186,6 +188,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" + AdditionalIncludeDirectories="$(PangoCairoIncs)" PreprocessorDefinitions="_DEBUG;$(PangoDefines);$(NoFCDef)" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -215,7 +218,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(PangoFT2Incs)" + AdditionalIncludeDirectories="$(PangoCairoIncs);$(PangoFT2Incs)" PreprocessorDefinitions="$(PangoDefines)" RuntimeLibrary="2" UsePrecompiledHeader="0" @@ -244,6 +247,7 @@ > <Tool Name="VCCLCompilerTool" + AdditionalIncludeDirectories="$(PangoCairoIncs)" PreprocessorDefinitions="$(PangoDefines);$(NoFCDef)" RuntimeLibrary="2" UsePrecompiledHeader="0" |