Update VS Projects and related items

-Revert output DLL, LIB and header "install" folder to ...atk-1.0... and
 atk-1-vs?.dll as a result of commit	01cec72, so to stay consistent across
 the board
-Reflect the above changes in the README.txt files in the build/win32/vs?
 folders
-Clean up project files a bit-removed un-needed items, and have
 intermediate folders seperated for all projects.

6 files changed, 8 insertions, 17 deletions

diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt
index 9e5a3b7..6cfe3dd 100644
--- a/build/win32/vs10/README.txt
+++ b/build/win32/vs10/README.txt
@@ -75,7 +75,7 @@ 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-2.0. This is then from where

+<root>\vs10\<PlatformName>\include\atk-1.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.

 

diff --git a/build/win32/vs10/atk.props b/build/win32/vs10/atk.props
index 6eceee5..fbaa6ca 100644
--- 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>2.0</AtkApiVersion>
+    <AtkApiVersion>1.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_COMPILATION;DLL_EXPORT;ATK_LOCALEDIR="$(AtkDummyPrefix)/share/locale"</AtkDefines>
     <AtkLibtoolCompatibleDllPrefix>lib</AtkLibtoolCompatibleDllPrefix>
-    <AtkLibtoolCompatibleDllSuffix>-2.0-0</AtkLibtoolCompatibleDllSuffix>
+    <AtkLibtoolCompatibleDllSuffix>-1.0-0</AtkLibtoolCompatibleDllSuffix>
     <AtkSeparateVS10DllPrefix />
-    <AtkSeparateVS10DllSuffix>-2-vs10</AtkSeparateVS10DllSuffix>
+    <AtkSeparateVS10DllSuffix>-1-vs10</AtkSeparateVS10DllSuffix>
     <AtkDllPrefix>$(AtkSeparateVS10DllPrefix)</AtkDllPrefix>
     <AtkDllSuffix>$(AtkSeparateVS10DllSuffix)</AtkDllSuffix>
   </PropertyGroup>
diff --git a/build/win32/vs10/atk.vcxprojin b/build/win32/vs10/atk.vcxprojin
index 7b96beb..4861e4c 100644
--- a/build/win32/vs10/atk.vcxprojin
+++ b/build/win32/vs10/atk.vcxprojin
@@ -62,12 +62,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(Platform)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(Platform)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(Platform)\bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(Platform)\obj\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt
index c3ddcb4..847430f 100644
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@ -75,7 +75,7 @@ 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-2.0. This is then from where

+<root>\vs9\<PlatformName>\include\atk-1.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.

 

diff --git a/build/win32/vs9/atk.vcprojin b/build/win32/vs9/atk.vcprojin
index 7876365..4089412 100644
--- a/build/win32/vs9/atk.vcprojin
+++ b/build/win32/vs9/atk.vcprojin
@@ -21,8 +21,6 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
 			ConfigurationType="2"
 			InheritedPropertySheets=".\atk.vsprops"
 			CharacterSet="1"
@@ -59,8 +57,6 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
 			ConfigurationType="2"
 			InheritedPropertySheets=".\atk.vsprops"
 			CharacterSet="1"
diff --git a/build/win32/vs9/atk.vsprops b/build/win32/vs9/atk.vsprops
index 56d419e..11e932a 100644
--- a/build/win32/vs9/atk.vsprops
+++ b/build/win32/vs9/atk.vsprops
@@ -33,7 +33,7 @@ $(AtkEtcInstallRoot)\bin\glib-genmarshal --prefix=atk_marshal ..\..\..\atk\atkma
 	/>
 	<UserMacro
 		Name="AtkApiVersion"
-		Value="2.0"
+		Value="1.0"
 	/>
 	<UserMacro
 		Name="AtkDummyPrefix"
@@ -96,7 +96,7 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(AtkApiVersion).l
 	/>
 	<UserMacro
 		Name="AtkLibtoolCompatibleDllSuffix"
-		Value="-2.0-0"
+		Value="-1.0-0"
 	/>
 	<UserMacro
 		Name="AtkSeparateVS9DllPrefix"
@@ -104,7 +104,7 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(AtkApiVersion).l
 	/>
 	<UserMacro
 		Name="AtkSeparateVS9DllSuffix"
-		Value="-2-vs9"
+		Value="-1-vs9"
 	/>
 	<!-- Change these two to AtkLibtoolCompatibleDllPrefix and
 	AtkLibtoolCompatibleDllSuffix if that is what you want -->