VS 2008/2010 support update

-Update the property sheets for 2.x release and other refinements
-Update README.txt

diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt
index fd87feb..37d5a92 100644 (file)
--- a/build/win32/vs10/README.txt
+++ b/build/win32/vs10/README.txt
@@ -8,7 +8,7 @@ You will also need to expand atk.vcprojin here into
 atk.vcproj.
 
 The dependencies for this package are gettext-runtime (libintl), GLib*
-(inclusive of GLib, GModule, GThread, GObject) and ZLib.
+and ZLib.
 
 a) look for all of the dependencies (except GLib*) under
 
@@ -16,7 +16,7 @@ a) look for all of the dependencies (except GLib*) under
    http://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64-bit)
 
    Please use the latest versions of these libraries that are available there,
-   these are packaged by Tor Lillqvist, which are built with MinGW/GCC AFAIK.
+   these are packaged by Tor Lillqvist, which are built with MinGW/GCC.
    Please see b) below regarding the build of  GLib*
 
 -OR-
@@ -75,9 +75,9 @@ After the build of ATK, the "install" project will copy build results
 and headers into their appropriate location under <root>\vs10\<PlatformName>.
 For instance, built DLLs go into <root>\vs10\<PlatformName>\bin, built LIBs into
 <root>\vs10\<PlatformName>\lib and atk headers into
-<root>\vs10\<PlatformName>\include\atk-1.0. This is then from where
+<root>\vs10\<PlatformName>\include\atk-2.0. This is then from where
 project files higher in the stack are supposed to look for them, not
 from a specific ATK source tree.
 
---Chun-wei Fan <fanc999 --at-- yahoo _dot_ com _dot_ tw>
+--Chun-wei Fan <fanc999@yahoo.com.tw>
 --(adapted from the GLib VS9 README.txt file originally written by Tor Lillqvist)

diff --git a/build/win32/vs10/atk.props b/build/win32/vs10/atk.props
index e3afb34..0335940 100644 (file)
--- a/build/win32/vs10/atk.props
+++ b/build/win32/vs10/atk.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
-    <AtkApiVersion>1.0</AtkApiVersion>
+    <AtkApiVersion>2.0</AtkApiVersion>
     <AtkDummyPrefix>\"/dummy\"</AtkDummyPrefix>
     <AtkEtcInstallRoot>..\..\..\..\..\vs10\$(Platform)</AtkEtcInstallRoot>
     <CopyDir>$(AtkEtcInstallRoot)</CopyDir>
@@ -82,9 +82,9 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*-$(AtkApiVersion).lib $(Cop
     <GenerateAtkDef>echo EXPORTS &gt;"..\..\..\atk\atk.def" &amp;&amp; cl /EP ..\..\..\atk\atk.symbols &gt;&gt;"..\..\..\atk\atk.def"</GenerateAtkDef>
     <AtkDefines>ATK_LOCALEDIR="\"$(AtkDummyPrefix)/share/locale\""</AtkDefines>
     <AtkLibtoolCompatibleDllPrefix>lib</AtkLibtoolCompatibleDllPrefix>
-    <AtkLibtoolCompatibleDllSuffix>-1.0-0</AtkLibtoolCompatibleDllSuffix>
+    <AtkLibtoolCompatibleDllSuffix>-2.0-0</AtkLibtoolCompatibleDllSuffix>
     <AtkSeparateVS10DllPrefix />
-    <AtkSeparateVS10DllSuffix>-1-vs10</AtkSeparateVS10DllSuffix>
+    <AtkSeparateVS10DllSuffix>-2-vs10</AtkSeparateVS10DllSuffix>
     <AtkDllPrefix>$(AtkSeparateVS10DllPrefix)</AtkDllPrefix>
     <AtkDllSuffix>$(AtkSeparateVS10DllSuffix)</AtkDllSuffix>
   </PropertyGroup>
@@ -114,13 +114,13 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h
 
 if exist ..\..\..\atk\atkmarshal.h goto GEN_MARS_C
 
-glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --header &gt;..\..\..\atk\atkmarshal.h
+$(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --header &gt;..\..\..\atk\atkmarshal.h
 
 :GEN_MARS_C
 
 if exist ..\..\..\atk\atkmarshal.c goto END
 
-glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --body &gt;..\..\..\atk\atkmarshal.c
+$(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --body &gt;..\..\..\atk\atkmarshal.c
 
 :END
 

diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt
index e040875..f0a4c71 100644 (file)
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@ -8,7 +8,7 @@ You will also need to expand atk.vcprojin here into
 atk.vcproj.
 
 The dependencies for this package are gettext-runtime (libintl), GLib*
-(inclusive of GLib, GModule, GThread, GObject) and ZLib.
+and ZLib.
 
 a) look for all of the dependencies (except GLib*) under
 
@@ -16,7 +16,7 @@ a) look for all of the dependencies (except GLib*) under
    http://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64-bit)
 
    Please use the latest versions of these libraries that are available there,
-   these are packaged by Tor Lillqvist, which are built with MinGW/GCC AFAIK.
+   these are packaged by Tor Lillqvist, which are built with MinGW/GCC.
    Please see b) below regarding the build of  GLib*
 
 -OR-
@@ -75,9 +75,9 @@ After the build of ATK, the "install" project will copy build results
 and headers into their appropriate location under <root>\vs9\<PlatformName>.
 For instance, built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into
 <root>\vs9\<PlatformName>\lib and atk headers into
-<root>\vs9\<PlatformName>\include\atk-1.0. This is then from where
+<root>\vs9\<PlatformName>\include\atk-2.0. This is then from where
 project files higher in the stack are supposed to look for them, not
 from a specific ATK source tree.
 
---Chun-wei Fan <fanc999 --at-- yahoo _dot_ com _dot_ tw>
+--Chun-wei Fan <fanc999@yahoo.com.tw>
 --(adapted from the GLib VS9 README.txt file originally written by Tor Lillqvist)

diff --git a/build/win32/vs9/atk.vsprops b/build/win32/vs9/atk.vsprops
index 2ec4a1f..8200bff 100644 (file)
--- a/build/win32/vs9/atk.vsprops
+++ b/build/win32/vs9/atk.vsprops
@@ -24,16 +24,16 @@ if exist ..\..\..\config.h goto DONE_CONFIG_H

 copy ..\..\..\config.h.win32 ..\..\..\config.h

 :DONE_CONFIG_H

 if exist ..\..\..\atk\atkmarshal.h goto GEN_MARS_C

-glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --header >..\..\..\atk\atkmarshal.h

+$(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --header >..\..\..\atk\atkmarshal.h

 :GEN_MARS_C

 if exist ..\..\..\atk\atkmarshal.c goto END

-glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --body >..\..\..\atk\atkmarshal.c

+$(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkmarshal.list --body >..\..\..\atk\atkmarshal.c

 :END

 "
        />
        <UserMacro
                Name="AtkApiVersion"
-               Value="1.0"
+               Value="2.0"
        />
        <UserMacro
                Name="AtkDummyPrefix"
@@ -96,7 +96,7 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(AtkApiVersion).l
        />
        <UserMacro
                Name="AtkLibtoolCompatibleDllSuffix"
-               Value="-1.0-0"
+               Value="-2.0-0"
        />
        <UserMacro
                Name="AtkSeparateVS9DllPrefix"
@@ -104,7 +104,7 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(AtkApiVersion).l
        />
        <UserMacro
                Name="AtkSeparateVS9DllSuffix"
-               Value="-1-vs9"
+               Value="-2-vs9"
        />
        <!-- Change these two to AtkLibtoolCompatibleDllPrefix and
        AtkLibtoolCompatibleDllSuffix if that is what you want -->