[json-glib] MSVC builds: Look for headers in include/gio-win32-2.0
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [json-glib] MSVC builds: Look for headers in include/gio-win32-2.0
- Date: Fri, 22 Apr 2016 11:46:16 +0000 (UTC)
commit c2f43c6fb5d702a8037cf28fc9318367c4140b84
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Mar 7 14:16:44 2016 +0800
MSVC builds: Look for headers in include/gio-win32-2.0
gio.h is going to include headers from include/gio-win32-2.0 at some
point, so make sure we look for headers from there as well during the
build.
build/win32/vs10/json-glib-build-defines.props | 4 ++--
build/win32/vs9/json-glib-build-defines.vsprops | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/build/win32/vs10/json-glib-build-defines.props b/build/win32/vs10/json-glib-build-defines.props
index b6267cc..412f7d1 100644
--- a/build/win32/vs10/json-glib-build-defines.props
+++ b/build/win32/vs10/json-glib-build-defines.props
@@ -13,14 +13,14 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-
<AdditionalIncludeDirectories>..\..\..;..\..\..\json-glib;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>..\..\..;..\..\..\json-glib;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
-
<AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+
<AdditionalDependencies>gio-2.0.lib;gobject-2.0.lib;glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
diff --git a/build/win32/vs9/json-glib-build-defines.vsprops b/build/win32/vs9/json-glib-build-defines.vsprops
index 33c9afb..e48f987 100644
--- a/build/win32/vs9/json-glib-build-defines.vsprops
+++ b/build/win32/vs9/json-glib-build-defines.vsprops
@@ -9,14 +9,14 @@
>
<Tool
Name="VCCLCompilerTool"
-
AdditionalIncludeDirectories="..\..\..;..\..\..\json-glib;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
+
AdditionalIncludeDirectories="..\..\..;..\..\..\json-glib;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
PreprocessorDefinitions="HAVE_CONFIG_H"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
AdditionalOptions="/MP"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gio-2.0.lib"
+ AdditionalDependencies="gio-2.0.lib gobject-2.0.lib glib-2.0.lib"
AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
/>
<UserMacro
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]