summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2016-03-02 12:35:33 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2016-03-02 12:36:42 +0800
commitc228f6978e09af7c91ce954262c9e0f85496e76f (patch)
tree1bf2a2e702c6ab88f75d970498bc9ecdb2fd1599
parent6c81be9ef621bebcb33b9e2e2d86c7b09cc00322 (diff)
downloadpango-c228f6978e09af7c91ce954262c9e0f85496e76f.tar.gz
MSVC builds: Re-arrange GLib include paths
We ought to include the platform-neutral headers first...
-rw-r--r--build/win32/vs10/pango-build-defines.props2
-rw-r--r--build/win32/vs9/pango-build-defines.vsprops2
2 files changed, 2 insertions, 2 deletions
diff --git a/build/win32/vs10/pango-build-defines.props b/build/win32/vs10/pango-build-defines.props
index b88b2648..2d4b34b1 100644
--- a/build/win32/vs10/pango-build-defines.props
+++ b/build/win32/vs10/pango-build-defines.props
@@ -18,7 +18,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\..;..\..\..\pango;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\fontconfig;$(GlibEtcInstallRoot)\include\freetype2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;..\..\..\pango;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\fontconfig;$(GlibEtcInstallRoot)\include\freetype2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
diff --git a/build/win32/vs9/pango-build-defines.vsprops b/build/win32/vs9/pango-build-defines.vsprops
index ed892a79..8e1f9136 100644
--- a/build/win32/vs9/pango-build-defines.vsprops
+++ b/build/win32/vs9/pango-build-defines.vsprops
@@ -9,7 +9,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..;..\..\..\pango;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\fontconfig;$(GlibEtcInstallRoot)\include\freetype2"
+ AdditionalIncludeDirectories="..\..\..;..\..\..\pango;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\fontconfig;$(GlibEtcInstallRoot)\include\freetype2"
PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
AdditionalOptions="/MP"