[clutter/msvc-support] Update Visual Studio Project Files



commit 81ef6c1d0ab79bc0442d5776a53b06360ebf1877
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Jul 20 12:26:08 2011 +0800

    Update Visual Studio Project Files
    
    -Change ATK dependency back to atk-1.0.lib, and the corresponding include
     folder back to atk-1.0 for all projects as ATK-2.x will still retain
     the 1.0 suffixes. (ATK Commit 01cec72)
    -Update corresponding description in the VS README.txt files
    -Also fix up the VS2010 README.txt file a bit.

 build/win32/vs10/README.txt                        |   40 +++++++------------
 .../vs10/cally-atkeditabletext-example.vcxproj     |    8 ++--
 build/win32/vs10/cally-atkevents-example.vcxproj   |    8 ++--
 build/win32/vs10/cally-atktext-example.vcxproj     |    8 ++--
 build/win32/vs10/clutter.props                     |    2 +-
 build/win32/vs10/clutter.vcxprojin                 |    8 ++--
 build/win32/vs9/README.txt                         |   37 ++++++------------
 .../win32/vs9/cally-atkeditabletext-example.vcproj |    8 ++--
 build/win32/vs9/cally-atkevents-example.vcproj     |    8 ++--
 build/win32/vs9/cally-atktext-example.vcproj       |    8 ++--
 build/win32/vs9/clutter.vcprojin                   |    8 ++--
 build/win32/vs9/clutter.vsprops                    |    2 +-
 12 files changed, 62 insertions(+), 83 deletions(-)
---
diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt
index 1d7ef32..a6081c9 100644
--- a/build/win32/vs10/README.txt
+++ b/build/win32/vs10/README.txt
@@ -4,11 +4,12 @@ This VS10 solution and the projects it includes are intented to be used
 in a Clutter source tree unpacked from a tarball. In a git checkout you
 first need to use some Unix-like environment or manual work to expand
 the files needed, like config.h.win32.in into config.h.win32 and the
-.vcprojin files here into corresponding actual .vcproj files.
+.vcprojxin and .vcxproj.filtersin files here into corresponding actual
+.vcxproj and .vcxproj.filters files.
 
 You will need the parts from GNOME: Cogl, JSON-GLib, GDK-Pixbuf,
-Pango**, atk (2.x)* and GLib. External dependencies are at least zlib, libpng,
-gettext-runtime** and Cairo**, and glext.h from
+Pango*, atk and GLib. External dependencies are at least zlib, libpng,
+gettext-runtime* and Cairo*, and glext.h from
 http://www.opengl.org/registry/api/glext.h (which need to be in the GL folder
 in your include directories or in <root>\vs10\<PlatformName>\include\GL).
 
@@ -22,12 +23,12 @@ CRTs-please see also the build/win32/vs10/README.txt in those respective package
 The recommended build sequence of the dependencies are as follows (the non-GNOME
 packages that are not downloaded as binaries from ftp://ftp.gnome.org have
 makefiles and/or VS project files that can be used to compile with VS directly,
-except the optional PCRE, which is built on VS using CMake; GLib & ATK-2.x have
+except the optional PCRE, which is built on VS using CMake; GLib & ATK have
 VS10 project files in the latest stable versions, GDK-Pixbuf have VS10 project files
 in the latest unstable version, and Cogl, JSON-GLib and Pango should have VS10 project
 files in the next unstable release):
 -Unzip the binary packages for gettext-runtime, freetype, expat and fontconfig
- downloaded from ftp://ftp.gnome.org**
+ downloaded from ftp://ftp.gnome.org*
 -zlib
 -libpng
 -(optional for GLib) PCRE (8.12 or later, building PCRE using CMake is
@@ -38,11 +39,11 @@ files in the next unstable release):
 -GLib
 -Cairo
 -Pango
--ATK-2.x*
+-ATK
 -GDK-Pixbuf
 -JSON-GLib
 -Cogl
- (Note that Pango, ATK-2.x, GDK-Pixbuf and JSON-GLib are not dependent on each
+ (Note that Pango, ATK, GDK-Pixbuf and JSON-GLib are not dependent on each
  other, so building them in any order will do)
 
 Note that a working PERL installation (such as ActiveState or Strawberry PERL)
@@ -68,26 +69,15 @@ appropriate location under <root>\vs10\<PlatformName>. For instance,
 built DLLs go into <root>\vs10\<PlatformName>\bin, built LIBs into
 <root>\vs10\<PlatformName>\lib and Clutter headers into
 <root>\vs10\<PlatformName>\include\clutter-1.0.
-
-*Regarding ATK-2.x: prior to compiling ATK-2.0.0, please open atkprops
- in VS under "Properties Manager" view (it is under any one of the
- build configurations, right-click on atkprops and select "Properties").
- Navigate to "User Macros", and edit the following fields:
- AtkApiVersion -> 2.0
- AtkLibToolCompatibleDllSuffix -> -2.0-0
- AtkSeperateVS10DLLSuffix -> -2-vs10
- Sorry this change did not make it upstream prior to ATK-2.0.0 release-
- this will be in the subsequent releases of ATK-2.x and was committed
- upstream.
  
-**There is no known official VS10 build support for fontconfig
-  (required for Pango and Pango at the moment-I will see whether this
-  requirement can be made optional for VS builds)
-  (along with freetype and expat) and gettext-runtime, so
-  please use the binaries from: 
+*There is no known official VS10 build support for fontconfig
+ (required for Pango and Pango at the moment-I will see whether this
+ requirement can be made optional for VS builds)
+ (along with freetype and expat) and gettext-runtime, so
+ please use the binaries from: 
 
-  ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)
-  ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)
+ ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)
+ ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)
 
 --Chun-wei Fan <fanc999 yahoo com tw>
   (Adopted from the GTK+ Win32 VS README.txt file originally by Tor Lillqvist)
diff --git a/build/win32/vs10/cally-atkeditabletext-example.vcxproj b/build/win32/vs10/cally-atkeditabletext-example.vcxproj
index 5d8f35e..14bfbbd 100644
--- a/build/win32/vs10/cally-atkeditabletext-example.vcxproj
+++ b/build/win32/vs10/cally-atkeditabletext-example.vcxproj
@@ -81,7 +81,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -101,7 +101,7 @@
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -123,7 +123,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -142,7 +142,7 @@
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
diff --git a/build/win32/vs10/cally-atkevents-example.vcxproj b/build/win32/vs10/cally-atkevents-example.vcxproj
index f946c80..de73895 100644
--- a/build/win32/vs10/cally-atkevents-example.vcxproj
+++ b/build/win32/vs10/cally-atkevents-example.vcxproj
@@ -81,7 +81,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -101,7 +101,7 @@
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -123,7 +123,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -142,7 +142,7 @@
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
diff --git a/build/win32/vs10/cally-atktext-example.vcxproj b/build/win32/vs10/cally-atktext-example.vcxproj
index 9a3d119..00e1e83 100644
--- a/build/win32/vs10/cally-atktext-example.vcxproj
+++ b/build/win32/vs10/cally-atktext-example.vcxproj
@@ -81,7 +81,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -101,7 +101,7 @@
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -123,7 +123,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -142,7 +142,7 @@
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;gmodule-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
diff --git a/build/win32/vs10/clutter.props b/build/win32/vs10/clutter.props
index c3ae77e..dce0310 100644
--- a/build/win32/vs10/clutter.props
+++ b/build/win32/vs10/clutter.props
@@ -334,7 +334,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)\include\json-glib-1.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.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 ef9d371..fda140a 100644
--- a/build/win32/vs10/clutter.vcxprojin
+++ b/build/win32/vs10/clutter.vcxprojin
@@ -87,7 +87,7 @@
       <Command>$(GenerateClutterDef)</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.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-gobject.lib;cairo.lib;atk-1.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>
@@ -116,7 +116,7 @@
       <Command>$(GenerateClutterDef)</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.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-gobject.lib;cairo.lib;atk-1.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>
@@ -145,7 +145,7 @@
       <Command>$(GenerateClutterDef)</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.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-gobject.lib;cairo.lib;atk-1.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>
@@ -173,7 +173,7 @@
       <Command>$(GenerateClutterDef)</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>opengl32.lib;winmm.lib;intl.lib;json-glib-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo-gobject.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-gobject.lib;cairo.lib;atk-1.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/README.txt b/build/win32/vs9/README.txt
index 52daae6..588ed5c 100644
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@ -7,8 +7,8 @@ the files needed, like config.h.win32.in into config.h.win32 and the
 .vcprojin files here into corresponding actual .vcproj files.
 
 You will need the parts from GNOME: Cogl, JSON-GLib, GDK-Pixbuf,
-Pango**, atk (2.x)* and GLib. External dependencies are at least zlib, libpng,
-gettext-runtime** and Cairo**, and glext.h from
+Pango*, atk and GLib. External dependencies are at least zlib, libpng,
+gettext-runtime* and Cairo*, and glext.h from
 http://www.opengl.org/registry/api/glext.h (which need to be in the GL folder
 in your include directories or in <root>\vs9\<PlatformName>\include\GL).
 
@@ -22,12 +22,12 @@ CRTs-please see also the build/win32/vs9/README.txt in those respective packages
 The recommended build sequence of the dependencies are as follows (the non-GNOME
 packages that are not downloaded as binaries from ftp://ftp.gnome.org have
 makefiles and/or VS project files that can be used to compile with VS directly,
-except the optional PCRE, which is built on VS using CMake; GLib & ATK-2.x have
+except the optional PCRE, which is built on VS using CMake; GLib & ATK have
 VS9 project files in the latest stable versions, GDK-Pixbuf have VS9 project files
 in the latest unstable version, and JSON-GLib, Pango and Cogl should have VS9
 project files in the next unstable release):
 -Unzip the binary packages for gettext-runtime, freetype, expat and fontconfig
- downloaded from ftp://ftp.gnome.org**
+ downloaded from ftp://ftp.gnome.org*
 -zlib
 -libpng
 -(optional for GLib) PCRE (8.12 or later, building PCRE using CMake is
@@ -38,11 +38,11 @@ project files in the next unstable release):
 -GLib
 -Cairo
 -Pango
--ATK-2.x*
+-ATK
 -GDK-Pixbuf
 -JSON-GLib
 -Cogl
- (Note that Pango, ATK-2.x, GDK-Pixbuf and JSON-GLib are not dependent on each
+ (Note that Pango, ATK, GDK-Pixbuf and JSON-GLib are not dependent on each
  other, so building them in any order will do)
 
 Note that a working PERL installation (such as ActiveState or Strawberry PERL)
@@ -68,26 +68,15 @@ appropriate location under <root>\vs9\<PlatformName>. For instance,
 built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into
 <root>\vs9\<PlatformName>\lib and Clutter headers into
 <root>\vs9\<PlatformName>\include\clutter-1.0.
-
-*Regarding ATK-2.x: prior to compiling ATK-2.0.0, please open atkprops
- in VS under "Properties Manager" view (it is under any one of the
- build configurations, right-click on atkprops and select "Properties").
- Navigate to "User Macros", and edit the following fields:
- AtkApiVersion -> 2.0
- AtkLibToolCompatibleDllSuffix -> -2.0-0
- AtkSeperateVS9DLLSuffix -> -2-vs9
- Sorry this change did not make it upstream prior to ATK-2.0.0 release-
- this will be in the subsequent releases of ATK-2.x and was committed
- upstream.
  
-**There is no known official VS9 build support for fontconfig
-  (required for Pango and Pango at the moment-I will see whether this
-  requirement can be made optional for VS builds)
-  (along with freetype and expat) and gettext-runtime, so
-  please use the binaries from: 
+*There is no known official VS9 build support for fontconfig
+ (required for Pango and Pango at the moment-I will see whether this
+ requirement can be made optional for VS builds)
+ (along with freetype and expat) and gettext-runtime, so
+ please use the binaries from: 
 
-  ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)
-  ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)
+ ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)
+ ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)
 
 --Chun-wei Fan <fanc999 yahoo com tw>
   (Adopted from the GTK+ Win32 VS README.txt file originally by Tor Lillqvist)
diff --git a/build/win32/vs9/cally-atkeditabletext-example.vcproj b/build/win32/vs9/cally-atkeditabletext-example.vcproj
index 5b29e79..b2316dc 100644
--- a/build/win32/vs9/cally-atkeditabletext-example.vcproj
+++ b/build/win32/vs9/cally-atkeditabletext-example.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-				AdditionalDependencies="atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="atk-1.0.lib gmodule-2.0.lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -71,7 +71,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="atk-1.0.lib gmodule-2.0.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -104,7 +104,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-				AdditionalDependencies="atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="atk-1.0.lib gmodule-2.0.lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -134,7 +134,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-				AdditionalDependencies="atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="atk-1.0.lib gmodule-2.0.lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/build/win32/vs9/cally-atkevents-example.vcproj b/build/win32/vs9/cally-atkevents-example.vcproj
index 670d6b7..ca5829c 100644
--- a/build/win32/vs9/cally-atkevents-example.vcproj
+++ b/build/win32/vs9/cally-atkevents-example.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-				AdditionalDependencies="atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="atk-1.0.lib gmodule-2.0.lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -71,7 +71,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="atk-1.0.lib gmodule-2.0.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -104,7 +104,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-				AdditionalDependencies="atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="atk-1.0.lib gmodule-2.0.lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -134,7 +134,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-				AdditionalDependencies="atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="atk-1.0.lib gmodule-2.0.lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/build/win32/vs9/cally-atktext-example.vcproj b/build/win32/vs9/cally-atktext-example.vcproj
index af2248e..22f4d6b 100644
--- a/build/win32/vs9/cally-atktext-example.vcproj
+++ b/build/win32/vs9/cally-atktext-example.vcproj
@@ -41,7 +41,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="atk-1.0.lib gmodule-2.0.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -71,7 +71,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="atk-1.0.lib gmodule-2.0.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -104,7 +104,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-				AdditionalDependencies="atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="atk-1.0.lib gmodule-2.0.lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -134,7 +134,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-				AdditionalDependencies="atk-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies="atk-1.0.lib gmodule-2.0.lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/build/win32/vs9/clutter.vcprojin b/build/win32/vs9/clutter.vcprojin
index 23a2c6d..45fcb18 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-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.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-gobject.lib cairo.lib atk-1.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-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.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-gobject.lib cairo.lib atk-1.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-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.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-gobject.lib cairo.lib atk-1.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-1.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.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-gobject.lib cairo.lib atk-1.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 f659273..6ccc687 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)\include\json-glib-1.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
+		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.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]