[json-glib] Fix VS property sheets
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [json-glib] Fix VS property sheets
- Date: Tue, 15 Nov 2011 08:44:37 +0000 (UTC)
commit 9e4c685e9aa284cf67c4331942edfb8b5ace2c50
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Nov 15 16:43:28 2011 +0800
Fix VS property sheets
The $(GlibEtcInstallRoot)\include\glib-2.0 needs to be specified in
"AdditionalIncludeDirectories" as well so that we will not mistakenly
pick up glibconfig.h from a GLib version and other GLib headers from
another version accidently.
build/win32/vs10/json-glib.props | 4 ++--
build/win32/vs9/json-glib.vsprops | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/build/win32/vs10/json-glib.props b/build/win32/vs10/json-glib.props
index 226e514..1e36957 100644
--- a/build/win32/vs10/json-glib.props
+++ b/build/win32/vs10/json-glib.props
@@ -73,8 +73,8 @@ copy ..\..\..\json-glib\json-types.h $(CopyDir)\include\json-glib-$(JsonGlibVers
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\..;..\..\..\json-glib;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..;..\..\..\json-glib;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
diff --git a/build/win32/vs9/json-glib.vsprops b/build/win32/vs9/json-glib.vsprops
index 8896e69..ffb1c85 100644
--- a/build/win32/vs9/json-glib.vsprops
+++ b/build/win32/vs9/json-glib.vsprops
@@ -8,8 +8,8 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..;..\..\..\json-glib;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
- PreprocessorDefinitions="HAVE_CONFIG_H"
+ AdditionalIncludeDirectories="..\..\..;..\..\..\json-glib;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
+ PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
/>
<Tool
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]