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.

diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt
index 0fb5cb6a037bf8d0ddf8910cee4331f0083fb7e5..c99588eb96fec66bb4dfde38b415ec55f8a42593 100644 (file)
--- 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\r
 first need to use some Unix-like environment or manual work to expand\r
 the files needed, like config.h.win32.in into config.h.win32 and the\r
-.vcprojin files here into corresponding actual .vcproj files.\r
+.vcxprojin and .vcxproj.filtersin files here into corresponding actual\r
+.vcxproj and vcxproj.filters files.\r
 \r
 You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango,\r
 ATK and GLib.  External dependencies are at least Cairo\r
@@ -20,8 +21,8 @@ to different CRTs can be kept at a minimum.
 zlib, libpng, and Cairo do contain support for compiling under VS10\r
 using VS project files and/or makefiles at this time of writing, For the\r
 GTK+ stack, VS10 project files are either available under\r
-$(srcroot)/build/vs10 in the case of GLib (stable/unstable), ATK**\r
-(2.x stable/unstable) and GDK-Pixbuf (unstable), and should be in the next\r
+$(srcroot)/build/vs10 in the case of GLib (stable/unstable), ATK\r
+(stable/unstable) and GDK-Pixbuf (unstable), and should be in the next\r
 unstable version of Pango.  There is no known official VS10 build\r
 support for fontconfig (along with freetype and expat) and\r
 gettext-runtime, so please use the binaries from: \r
@@ -48,11 +49,11 @@ The recommended build order for these dependencies:
 -(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library]\r
 -(optional for GLib) PCRE (version 8.12 or later, use of CMake to\r
   build PCRE is recommended-see build/win32/vs10/README.txt of GLib)\r
--GLib ***\r
+-GLib **\r
 -Cairo (inclusive of Cairo-GObject)\r
--ATK-2.x** ***\r
--Pango***\r
--GDK-Pixbuf***\r
+-ATK**\r
+-Pango**\r
+-GDK-Pixbuf**\r
 (note the last 3 dependencies are not interdependent, so the last 3\r
  dependencies can be built in any order)\r
 \r
@@ -71,19 +72,8 @@ from a specific GLib source tree.
  are referred to by components in Cairo and Pango mainly.\r
  Decide whether you need fontconfig support prior to building Cairo\r
  and Pango.\r
- \r
-**Regarding ATK-2.x: prior to compiling ATK-2.x, please open atkprops\r
-  in VS under "Properties Manager" view (it is under any one of the\r
-  build configurations, right-click on atkprops and select "Properties").\r
-  Navigate to "User Macros", and edit the following fields:\r
-  AtkApiVersion -> 2.0\r
-  AtkLibToolCompatibleDllSuffix -> -2.0-0\r
-  AtkSeperateVS10DLLSuffix -> -2-vs10\r
-  Sorry this change did not make it upstream prior to ATK-2.0.0 release-\r
-  this will be in the subsequent releases of ATK-2.x and was committed\r
-  upstream.\r
 \r
-***:Put the sources of the packages marked with *** in <root>\<package-\r
+**:Put the sources of the packages marked with ** in <root>\<package-\r
     source-tree>, and build with VS10 from there.\r
 \r
 --Tor Lillqvist <tml@iki.fi>\r

diff --git a/build/win32/vs10/gailutil.vcxproj b/build/win32/vs10/gailutil.vcxproj
index 929eeaf5697f111877aa5d4e6f4a2d9c7749aa4c..67829fd76cd6bda9171129522aea96d93b685905 100644 (file)
--- a/build/win32/vs10/gailutil.vcxproj
+++ b/build/win32/vs10/gailutil.vcxproj
@@ -82,7 +82,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>atk-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>\r
@@ -105,7 +105,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>atk-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>\r
       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -128,7 +128,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>atk-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>\r
@@ -150,7 +150,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>atk-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>atk-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>\r
       <ModuleDefinitionFile>..\..\..\libgail-util\gailutil.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r

diff --git a/build/win32/vs10/gtk+.props b/build/win32/vs10/gtk+.props
index 2539624a07081ddb71c6faf5580260e59538dd6a..a2d1d42495df0ba7979bab93390cd7e243a13171 100644 (file)
--- 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 3e724a9e8e6aefae1a0c3918a866cbdc3a5cacd7..2023301ce7168b14c5046d18a35d72a37bba07ca 100644 (file)
--- 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 ea0c40a28fdf162e341ee685ede8459219bfc865..b06c0b0cd5144e04ef1b79818a967c405e69d773 100644 (file)
--- 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.\r
 \r
 You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango,\r
-ATK (2.x)** and GLib.  External dependencies are at least Cairo\r
+ATK and GLib.  External dependencies are at least Cairo\r
 (with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng,\r
 gettext-runtime, fontconfig*, freetype*, expat*.  See the \r
 build/win32/vs9/README.txt file in glib for details where to unpack them.\r
@@ -20,8 +20,8 @@ to different CRTs can be kept at a minimum.
 zlib, libpng, and Cairo do contain support for compiling under VS9\r
 using VS project files and/or makefiles at this time of writing, For the\r
 GTK+ stack, VS9 project files are either available under\r
-$(srcroot)/build/vs9 in the case of GLib (stable/unstable), ATK**\r
-(2.x stable/unstable) and GDK-Pixbuf (unstable), and should be in the next\r
+$(srcroot)/build/vs9 in the case of GLib (stable/unstable), ATK\r
+(stable/unstable) and GDK-Pixbuf (unstable), and should be in the next\r
 unstable version of Pango.  There is no known official VS9 build\r
 support for fontconfig (along with freetype and expat) and\r
 gettext-runtime, so please use the binaries from: \r
@@ -48,11 +48,11 @@ The recommended build order for these dependencies:
 -(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library])\r
 -(optional for GLib) PCRE (version 8.12 or later, use of CMake to\r
   build PCRE is recommended-see build/win32/vs9/README.txt of GLib)\r
--GLib ***\r
+-GLib **\r
 -Cairo (inclusive of Cairo-GObject)\r
--ATK-2.x** ***\r
--Pango***\r
--GDK-Pixbuf***\r
+-ATK**\r
+-Pango**\r
+-GDK-Pixbuf**\r
 (note the last 3 dependencies are not interdependent, so the last 3\r
  dependencies can be built in any order)\r
 \r
@@ -72,18 +72,7 @@ from a specific GLib source tree.
  Decide whether you need fontconfig support prior to building Cairo\r
  and Pango.\r
 \r
-**Regarding ATK-2.x: prior to compiling ATK-2.x, please open atkprops\r
-  in VS under "Properties Manager" view (it is under any one of the\r
-  build configurations, right-click on atkprops and select "Properties").\r
-  Navigate to "User Macros", and edit the following fields:\r
-  AtkApiVersion -> 2.0\r
-  AtkLibToolCompatibleDllSuffix -> -2.0-0\r
-  AtkSeperateVS9DLLSuffix -> -2-vs9\r
-  Sorry this change did not make it upstream prior to ATK-2.0.0 release-\r
-  this will be in the subsequent releases of ATK-2.x and was committed\r
-  upstream.\r
-\r
-***:Put the sources of the packages marked with *** in <root>\<package-\r
+**:Put the sources of the packages marked with ** in <root>\<package-\r
     source-tree>, and build with VS9 from there.\r
 \r
 --Tor Lillqvist <tml@iki.fi>\r

diff --git a/build/win32/vs9/gailutil.vcproj b/build/win32/vs9/gailutil.vcproj
index 632a503588429f2cdaa1254f9e5bd5d0692ca831..dea1ded41af511100dadc1d041b35fae90a1e8fe 100644 (file)
--- a/build/win32/vs9/gailutil.vcproj
+++ b/build/win32/vs9/gailutil.vcproj
@@ -43,7 +43,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="2"\r
-                               AdditionalDependencies="atk-2.0.lib"\r
+                               AdditionalDependencies="atk-1.0.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
                                GenerateDebugInformation="true"\r
                                ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"\r
@@ -75,7 +75,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="atk-2.0.lib"\r
+                               AdditionalDependencies="atk-1.0.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"\r
@@ -110,7 +110,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkIncremental="1"\r
-                               AdditionalDependencies="atk-2.0.lib"\r
+                               AdditionalDependencies="atk-1.0.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
                                GenerateDebugInformation="true"\r
                                ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"\r
@@ -141,7 +141,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="atk-2.0.lib"\r
+                               AdditionalDependencies="atk-1.0.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="..\..\..\libgail-util\gailutil.def"\r

diff --git a/build/win32/vs9/gtk+.vsprops b/build/win32/vs9/gtk+.vsprops
index 0855ac213d2c34e15f8524c5294f5fb7b72e0366..a96a8d23d98189021819e0dc69787b537e05ab57 100644 (file)
--- a/build/win32/vs9/gtk+.vsprops
+++ b/build/win32/vs9/gtk+.vsprops
@@ -8,7 +8,7 @@
        >\r
        <Tool\r
                Name="VCCLCompilerTool"\r
-               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"\r
+               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"\r
                PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"\r
                ForcedIncludeFiles="msvc_recommended_pragmas.h"\r
        />\r

diff --git a/build/win32/vs9/gtk.vcprojin b/build/win32/vs9/gtk.vcprojin
index 7aa0dca449899907d812e28818b15411b54621ab..e10878be154ff2f608037550e06f25cde141eb1e 100644 (file)
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -42,7 +42,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
+                               AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r
@@ -72,7 +72,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
+                               AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r
@@ -107,7 +107,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
+                               AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r
@@ -137,7 +137,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
+                               AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r