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.

8 files changed, 35 insertions, 56 deletions

diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt
index 0fb5cb6a03..c99588eb96 100644
--- a/build/win32/vs10/README.txt
+++ b/build/win32/vs10/README.txt
@@ -4,7 +4,8 @@ This VS10 solution and the projects it includes are intented to be used
 in a GTK+ 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.

+.vcxprojin and .vcxproj.filtersin files here into corresponding actual

+.vcxproj and vcxproj.filters files.

 

 You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango,

 ATK and GLib.  External dependencies are at least Cairo

@@ -20,8 +21,8 @@ to different CRTs can be kept at a minimum.
 zlib, libpng, and Cairo do contain support for compiling under VS10

 using VS project files and/or makefiles at this time of writing, For the

 GTK+ stack, VS10 project files are either available under

-$(srcroot)/build/vs10 in the case of GLib (stable/unstable), ATK**

-(2.x stable/unstable) and GDK-Pixbuf (unstable), and should be in the next

+$(srcroot)/build/vs10 in the case of GLib (stable/unstable), ATK

+(stable/unstable) and GDK-Pixbuf (unstable), and should be in the next

 unstable version of Pango.  There is no known official VS10 build

 support for fontconfig (along with freetype and expat) and

 gettext-runtime, so please use the binaries from: 

@@ -48,11 +49,11 @@ The recommended build order for these dependencies:
 -(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library]

 -(optional for GLib) PCRE (version 8.12 or later, use of CMake to

   build PCRE is recommended-see build/win32/vs10/README.txt of GLib)

--GLib ***

+-GLib **

 -Cairo (inclusive of Cairo-GObject)

--ATK-2.x** ***

--Pango***

--GDK-Pixbuf***

+-ATK**

+-Pango**

+-GDK-Pixbuf**

 (note the last 3 dependencies are not interdependent, so the last 3

  dependencies can be built in any order)

 

@@ -71,19 +72,8 @@ from a specific GLib source tree.
  are referred to by components in Cairo and Pango mainly.

  Decide whether you need fontconfig support prior to building Cairo

  and Pango.

- 

-**Regarding ATK-2.x: prior to compiling ATK-2.x, 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.

 

-***:Put the sources of the packages marked with *** in <root>\<package-

+**:Put the sources of the packages marked with ** in <root>\<package-

     source-tree>, and build with VS10 from there.

 

 --Tor Lillqvist <tml@iki.fi>

diff --git a/build/win32/vs10/gailutil.vcxproj b/build/win32/vs10/gailutil.vcxproj
index 929eeaf569..67829fd76c 100644
--- a/build/win32/vs10/gailutil.vcxproj
+++ b/build/win32/vs10/gailutil.vcxproj
@@ -82,7 +82,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>atk-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>

@@ -105,7 +105,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>atk-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>

       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -128,7 +128,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>atk-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>

@@ -150,7 +150,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

     </ClCompile>

     <Link>

-      <AdditionalDependencies>atk-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>

       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/build/win32/vs10/gtk+.props b/build/win32/vs10/gtk+.props
index 2539624a07..a2d1d42495 100644
--- a/build/win32/vs10/gtk+.props
+++ b/build/win32/vs10/gtk+.props
@@ -570,7 +570,7 @@ $(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
diff --git a/build/win32/vs10/gtk.vcxprojin b/build/win32/vs10/gtk.vcxprojin
index 3e724a9e8e..2023301ce7 100644
--- a/build/win32/vs10/gtk.vcxprojin
+++ b/build/win32/vs10/gtk.vcxprojin
@@ -80,7 +80,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -100,7 +100,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -125,7 +125,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -145,7 +145,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>atk-2.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll</OutputFile>
       <ModuleDefinitionFile>$(IntDir)gtk.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt
index ea0c40a28f..b06c0b0cd5 100644
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@ -7,7 +7,7 @@ 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 below in the GTK+ stack: GDK-Pixbuf, Pango,

-ATK (2.x)** and GLib.  External dependencies are at least Cairo

+ATK and GLib.  External dependencies are at least Cairo

 (with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng,

 gettext-runtime, fontconfig*, freetype*, expat*.  See the 

 build/win32/vs9/README.txt file in glib for details where to unpack them.

@@ -20,8 +20,8 @@ to different CRTs can be kept at a minimum.
 zlib, libpng, and Cairo do contain support for compiling under VS9

 using VS project files and/or makefiles at this time of writing, For the

 GTK+ stack, VS9 project files are either available under

-$(srcroot)/build/vs9 in the case of GLib (stable/unstable), ATK**

-(2.x stable/unstable) and GDK-Pixbuf (unstable), and should be in the next

+$(srcroot)/build/vs9 in the case of GLib (stable/unstable), ATK

+(stable/unstable) and GDK-Pixbuf (unstable), and should be in the next

 unstable version of Pango.  There is no known official VS9 build

 support for fontconfig (along with freetype and expat) and

 gettext-runtime, so please use the binaries from: 

@@ -48,11 +48,11 @@ The recommended build order for these dependencies:
 -(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library])

 -(optional for GLib) PCRE (version 8.12 or later, use of CMake to

   build PCRE is recommended-see build/win32/vs9/README.txt of GLib)

--GLib ***

+-GLib **

 -Cairo (inclusive of Cairo-GObject)

--ATK-2.x** ***

--Pango***

--GDK-Pixbuf***

+-ATK**

+-Pango**

+-GDK-Pixbuf**

 (note the last 3 dependencies are not interdependent, so the last 3

  dependencies can be built in any order)

 

@@ -72,18 +72,7 @@ from a specific GLib source tree.
  Decide whether you need fontconfig support prior to building Cairo

  and Pango.

 

-**Regarding ATK-2.x: prior to compiling ATK-2.x, 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.

-

-***:Put the sources of the packages marked with *** in <root>\<package-

+**:Put the sources of the packages marked with ** in <root>\<package-

     source-tree>, and build with VS9 from there.

 

 --Tor Lillqvist <tml@iki.fi>

diff --git a/build/win32/vs9/gailutil.vcproj b/build/win32/vs9/gailutil.vcproj
index 632a503588..dea1ded41a 100644
--- a/build/win32/vs9/gailutil.vcproj
+++ b/build/win32/vs9/gailutil.vcproj
@@ -43,7 +43,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				LinkIncremental="2"

-				AdditionalDependencies="atk-2.0.lib"

+				AdditionalDependencies="atk-1.0.lib"

 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"

 				GenerateDebugInformation="true"

 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"

@@ -75,7 +75,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="atk-2.0.lib"

+				AdditionalDependencies="atk-1.0.lib"

 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"

 				LinkIncremental="2"

 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"

@@ -110,7 +110,7 @@
 			<Tool

 				Name="VCLinkerTool"

 				LinkIncremental="1"

-				AdditionalDependencies="atk-2.0.lib"

+				AdditionalDependencies="atk-1.0.lib"

 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"

 				GenerateDebugInformation="true"

 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"

@@ -141,7 +141,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="atk-2.0.lib"

+				AdditionalDependencies="atk-1.0.lib"

 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"

 				LinkIncremental="2"

 				ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"

diff --git a/build/win32/vs9/gtk+.vsprops b/build/win32/vs9/gtk+.vsprops
index 0855ac213d..a96a8d23d9 100644
--- a/build/win32/vs9/gtk+.vsprops
+++ b/build/win32/vs9/gtk+.vsprops
@@ -8,7 +8,7 @@
 	>

 	<Tool

 		Name="VCCLCompilerTool"

-		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"

+		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"

 		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"

 		ForcedIncludeFiles="msvc_recommended_pragmas.h"

 	/>

diff --git a/build/win32/vs9/gtk.vcprojin b/build/win32/vs9/gtk.vcprojin
index 7aa0dca449..e10878be15 100644
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -42,7 +42,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"

+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"

 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"

 				LinkIncremental="2"

 				ModuleDefinitionFile="$(IntDir)\gtk.def"

@@ -72,7 +72,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"

+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"

 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"

 				LinkIncremental="2"

 				ModuleDefinitionFile="$(IntDir)\gtk.def"

@@ -107,7 +107,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"

+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"

 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"

 				LinkIncremental="2"

 				ModuleDefinitionFile="$(IntDir)\gtk.def"

@@ -137,7 +137,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"

+				AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"

 				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"

 				LinkIncremental="2"

 				ModuleDefinitionFile="$(IntDir)\gtk.def"