[clutter/msvc-support] Update json-glib paths/libs in projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/msvc-support] Update json-glib paths/libs in projects
- Date: Fri, 3 Jun 2011 06:42:49 +0000 (UTC)
commit 2c32ce11f12373dab1d76a2b517b0cab350ea9ca
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Jun 3 14:42:36 2011 +0800
Update json-glib paths/libs in projects
-Add json-glib include path in property sheet (it was somehow omitted)
-Change json-glib-0.0.lib to json-glib-1.0.lib to conform better to the
name used in autotools builds
build/win32/vs10/clutter.props | 2 +-
build/win32/vs10/clutter.vcxprojin | 8 ++++----
build/win32/vs9/clutter.vcprojin | 8 ++++----
build/win32/vs9/clutter.vsprops | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/build/win32/vs10/clutter.props b/build/win32/vs10/clutter.props
index e3fd087..33e18cd 100644
--- a/build/win32/vs10/clutter.props
+++ b/build/win32/vs10/clutter.props
@@ -329,7 +329,7 @@ copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ClutterApi
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\cogl-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\cogl-2.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>G_DISABLE_SINGLE_INCLUDES;G_DISABLE_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<DisableSpecificWarnings>4819;%(DisableSpecificWarnings)</DisableSpecificWarnings>
diff --git a/build/win32/vs10/clutter.vcxprojin b/build/win32/vs10/clutter.vcxprojin
index d997a8f..0d5551b 100644
--- a/build/win32/vs10/clutter.vcxprojin
+++ b/build/win32/vs10/clutter.vcxprojin
@@ -88,7 +88,7 @@
<Command>$(GenerateClutterDef)</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-0.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>..\..\..\clutter\clutter.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ClutterApiVersion).lib</ImportLibrary>
@@ -117,7 +117,7 @@
<Command>$(GenerateClutterDef)</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-0.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>..\..\..\clutter\clutter.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ClutterApiVersion).lib</ImportLibrary>
@@ -146,7 +146,7 @@
<Command>$(GenerateClutterDef)</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-0.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>..\..\..\clutter\clutter.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ClutterApiVersion).lib</ImportLibrary>
@@ -174,7 +174,7 @@
<Command>$(GenerateClutterDef)</Command>
</PreLinkEvent>
<Link>
- <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-0.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>..\..\..\clutter\clutter.def</ModuleDefinitionFile>
<ImportLibrary>$(TargetDir)$(ProjectName)-win32-$(ClutterApiVersion).lib</ImportLibrary>
diff --git a/build/win32/vs9/clutter.vcprojin b/build/win32/vs9/clutter.vcprojin
index 138df4c..d7f34bd 100644
--- a/build/win32/vs9/clutter.vcprojin
+++ b/build/win32/vs9/clutter.vcprojin
@@ -47,7 +47,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-0.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
+ AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="..\..\..\clutter\clutter.def"
@@ -85,7 +85,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-0.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
+ AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="..\..\..\clutter\clutter.def"
@@ -124,7 +124,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-0.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
+ AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll"
LinkIncremental="1"
ModuleDefinitionFile="..\..\..\clutter\clutter.def"
@@ -160,7 +160,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-0.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
+ AdditionalDependencies="opengl32.lib winmm.lib intl.lib json-glib-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo.lib atk-2.0.lib gmodule-2.0.lib"
OutputFile="$(OutDir)\$(ClutterDllPrefix)$(ProjectName)-win32$(ClutterDllSuffix).dll"
LinkIncremental="2"
ModuleDefinitionFile="..\..\..\clutter\clutter.def"
diff --git a/build/win32/vs9/clutter.vsprops b/build/win32/vs9/clutter.vsprops
index 529bf50..80836aa 100644
--- a/build/win32/vs9/clutter.vsprops
+++ b/build/win32/vs9/clutter.vsprops
@@ -8,7 +8,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;;$(GlibEtcInstallRoot)\include\cogl-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
+ AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\cogl-2.0;$(GlibEtcInstallRoot)\include\json-glib-1.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES;G_DISABLE_DEPRECATED"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
DisableSpecificWarnings="4819"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]