You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2007/12/13 02:25:56 UTC

svn commit: r603798 [6/9] - in /xalan/c/branches/dbertoni/VisualStudioFixup: ./ Projects/Win32/VC6/AllInOne/ Projects/Win32/VC6/ApacheModuleXSLT/ Projects/Win32/VC6/CompileStylesheet/ Projects/Win32/VC6/DocumentBuilder/ Projects/Win32/VC6/ExternalFunct...

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC8/XalanICU.sln
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC8/XalanICU.sln?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC8/XalanICU.sln (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC8/XalanICU.sln Wed Dec 12 17:25:38 2007
@@ -4,105 +4,105 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "conf", "conf\conf.vcproj", "{36DA52E4-C5FD-4BA7-9A58-945EF75865F7}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XalanExe", "XalanExe\XalanExe.vcproj", "{865E1333-C4FD-4F6D-AD22-BD93BFF0EF4B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CompileStylesheet", "CompileStylesheet\CompileStylesheet.vcproj", "{5FE5CE96-F3CF-45F8-8B49-1A6EFE1F0808}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocumentBuilder", "DocumentBuilder\DocumentBuilder.vcproj", "{F41473DF-6208-4A84-9DEC-AEEA3B4185F2}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExternalFunction", "ExternalFunction\ExternalFunction.vcproj", "{CB863D89-F181-4E81-9E48-E7690937C58C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ParsedSourceWrappers", "ParsedSourceWrappers\ParsedSourceWrappers.vcproj", "{451D3F58-1480-4D96-ABD5-A01BC535CE43}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SerializeNodeSet", "SerializeNodeSet\SerializeNodeSet.vcproj", "{CCC9A082-5BB8-4AE4-8D1B-242357B1BFD5}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleTransform", "SimpleTransform\SimpleTransform.vcproj", "{36FBD6C9-AA46-4B4E-A168-82274DA2A01E}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleXPathAPI", "SimpleXPathAPI\SimpleXPathAPI.vcproj", "{811E8D52-A70D-46E8-A041-6EB6414D419C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleXPathCAPI", "SimpleXPathCAPI\SimpleXPathCAPI.vcproj", "{3DDBE733-0C6D-4C78-BED3-9BBA327754BD}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StreamTransform", "StreamTransform\StreamTransform.vcproj", "{065C0817-2A3F-4B0A-93D2-DB891A451B35}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestXPath", "TestXPath\TestXPath.vcproj", "{67103626-AC3F-49B8-98C1-C78FB1A9F510}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestXSLT", "TestXSLT\TestXSLT.vcproj", "{06D7EA7F-3B1B-46E0-BBAA-4D7E41DEC929}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ThreadSafe", "ThreadSafe\ThreadSafe.vcproj", "{1D902586-5B5E-41CA-B74C-E9A1A9817527}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ThreadTest", "ThreadTest\ThreadTest.vcproj", "{9878FFC6-CC96-40B6-BEA0-29A4EA4A24E2}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TraceListen", "TraceListen\TraceListen.vcproj", "{66BE596B-7BB8-4C96-87DB-714AC31D4A39}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TransformToXercesDOM", "TransformToXercesDOM\TransformToXercesDOM.vcproj", "{FFF75001-7B36-47E8-99DC-ABA8BE82F996}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UseStylesheetParam", "UseStylesheetParam\UseStylesheetParam.vcproj", "{9C7FB0A8-138B-4732-905F-3EDC00C0D52F}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XalanTransform", "XalanTransform\XalanTransform.vcproj", "{16AD2005-39BA-4E52-A2C6-F5C3C56901FC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XalanTransformerCallback", "XalanTransformerCallback\XalanTransformerCallback.vcproj", "{8C50630B-96F5-46EC-B867-BABB36146AE8}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AllInOneWithICU", "AllInOne\AllInOneWithICU.vcproj", "{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AllInOneWithICU", "AllInOne\AllInOneWithICU.vcproj", "{755AD11C-80B9-4E33-9D3D-9A68884A3EC8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A76258B4-BAE5-4FAA-B5E3-DB7BE7B43760} = {A76258B4-BAE5-4FAA-B5E3-DB7BE7B43760}
 	EndProjectSection
@@ -114,21 +114,22 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perf", "Performance\perf.vcproj", "{DA7D35BC-F602-4AAC-BF4E-0BF5ED3B9761}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All\All.vcproj", "{C5513096-5115-434E-9785-4D1DEC12EB2B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All\AllWithICU.vcproj", "{FDDF7AB6-F714-4C89-869C-8919D26403AA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FFF75001-7B36-47E8-99DC-ABA8BE82F996} = {FFF75001-7B36-47E8-99DC-ABA8BE82F996}
 		{16AD2005-39BA-4E52-A2C6-F5C3C56901FC} = {16AD2005-39BA-4E52-A2C6-F5C3C56901FC}
 		{8C50630B-96F5-46EC-B867-BABB36146AE8} = {8C50630B-96F5-46EC-B867-BABB36146AE8}
 		{065C0817-2A3F-4B0A-93D2-DB891A451B35} = {065C0817-2A3F-4B0A-93D2-DB891A451B35}
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8} = {755AD11C-80B9-4E33-9D3D-9A68884A3EC8}
 		{67103626-AC3F-49B8-98C1-C78FB1A9F510} = {67103626-AC3F-49B8-98C1-C78FB1A9F510}
 		{865E1333-C4FD-4F6D-AD22-BD93BFF0EF4B} = {865E1333-C4FD-4F6D-AD22-BD93BFF0EF4B}
+		{3DDBE733-0C6D-4C78-BED3-9BBA327754BD} = {3DDBE733-0C6D-4C78-BED3-9BBA327754BD}
 		{811E8D52-A70D-46E8-A041-6EB6414D419C} = {811E8D52-A70D-46E8-A041-6EB6414D419C}
 		{451D3F58-1480-4D96-ABD5-A01BC535CE43} = {451D3F58-1480-4D96-ABD5-A01BC535CE43}
 		{66BE596B-7BB8-4C96-87DB-714AC31D4A39} = {66BE596B-7BB8-4C96-87DB-714AC31D4A39}
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6} = {E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}
 		{06D7EA7F-3B1B-46E0-BBAA-4D7E41DEC929} = {06D7EA7F-3B1B-46E0-BBAA-4D7E41DEC929}
 		{CCC9A082-5BB8-4AE4-8D1B-242357B1BFD5} = {CCC9A082-5BB8-4AE4-8D1B-242357B1BFD5}
 		{D3EADA85-50F9-4A1D-A2F7-18612358B436} = {D3EADA85-50F9-4A1D-A2F7-18612358B436}
@@ -136,7 +137,6 @@
 		{CB863D89-F181-4E81-9E48-E7690937C58C} = {CB863D89-F181-4E81-9E48-E7690937C58C}
 		{5FE5CE96-F3CF-45F8-8B49-1A6EFE1F0808} = {5FE5CE96-F3CF-45F8-8B49-1A6EFE1F0808}
 		{9C7FB0A8-138B-4732-905F-3EDC00C0D52F} = {9C7FB0A8-138B-4732-905F-3EDC00C0D52F}
-		{A76258B4-BAE5-4FAA-B5E3-DB7BE7B43760} = {A76258B4-BAE5-4FAA-B5E3-DB7BE7B43760}
 		{DA7D35BC-F602-4AAC-BF4E-0BF5ED3B9761} = {DA7D35BC-F602-4AAC-BF4E-0BF5ED3B9761}
 		{9878FFC6-CC96-40B6-BEA0-29A4EA4A24E2} = {9878FFC6-CC96-40B6-BEA0-29A4EA4A24E2}
 		{36FBD6C9-AA46-4B4E-A168-82274DA2A01E} = {36FBD6C9-AA46-4B4E-A168-82274DA2A01E}
@@ -147,160 +147,211 @@
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
-		Release with symbols|Win32 = Release with symbols|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D3EADA85-50F9-4A1D-A2F7-18612358B436}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D3EADA85-50F9-4A1D-A2F7-18612358B436}.Debug|Win32.Build.0 = Debug|Win32
-		{D3EADA85-50F9-4A1D-A2F7-18612358B436}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{D3EADA85-50F9-4A1D-A2F7-18612358B436}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{D3EADA85-50F9-4A1D-A2F7-18612358B436}.Debug|x64.ActiveCfg = Debug|x64
+		{D3EADA85-50F9-4A1D-A2F7-18612358B436}.Debug|x64.Build.0 = Debug|x64
 		{D3EADA85-50F9-4A1D-A2F7-18612358B436}.Release|Win32.ActiveCfg = Release|Win32
 		{D3EADA85-50F9-4A1D-A2F7-18612358B436}.Release|Win32.Build.0 = Release|Win32
+		{D3EADA85-50F9-4A1D-A2F7-18612358B436}.Release|x64.ActiveCfg = Release|x64
+		{D3EADA85-50F9-4A1D-A2F7-18612358B436}.Release|x64.Build.0 = Release|x64
 		{36DA52E4-C5FD-4BA7-9A58-945EF75865F7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{36DA52E4-C5FD-4BA7-9A58-945EF75865F7}.Debug|Win32.Build.0 = Debug|Win32
-		{36DA52E4-C5FD-4BA7-9A58-945EF75865F7}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{36DA52E4-C5FD-4BA7-9A58-945EF75865F7}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{36DA52E4-C5FD-4BA7-9A58-945EF75865F7}.Debug|x64.ActiveCfg = Debug|x64
+		{36DA52E4-C5FD-4BA7-9A58-945EF75865F7}.Debug|x64.Build.0 = Debug|x64
 		{36DA52E4-C5FD-4BA7-9A58-945EF75865F7}.Release|Win32.ActiveCfg = Release|Win32
 		{36DA52E4-C5FD-4BA7-9A58-945EF75865F7}.Release|Win32.Build.0 = Release|Win32
+		{36DA52E4-C5FD-4BA7-9A58-945EF75865F7}.Release|x64.ActiveCfg = Release|x64
+		{36DA52E4-C5FD-4BA7-9A58-945EF75865F7}.Release|x64.Build.0 = Release|x64
 		{865E1333-C4FD-4F6D-AD22-BD93BFF0EF4B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{865E1333-C4FD-4F6D-AD22-BD93BFF0EF4B}.Debug|Win32.Build.0 = Debug|Win32
-		{865E1333-C4FD-4F6D-AD22-BD93BFF0EF4B}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{865E1333-C4FD-4F6D-AD22-BD93BFF0EF4B}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{865E1333-C4FD-4F6D-AD22-BD93BFF0EF4B}.Debug|x64.ActiveCfg = Debug|x64
+		{865E1333-C4FD-4F6D-AD22-BD93BFF0EF4B}.Debug|x64.Build.0 = Debug|x64
 		{865E1333-C4FD-4F6D-AD22-BD93BFF0EF4B}.Release|Win32.ActiveCfg = Release|Win32
 		{865E1333-C4FD-4F6D-AD22-BD93BFF0EF4B}.Release|Win32.Build.0 = Release|Win32
+		{865E1333-C4FD-4F6D-AD22-BD93BFF0EF4B}.Release|x64.ActiveCfg = Release|x64
+		{865E1333-C4FD-4F6D-AD22-BD93BFF0EF4B}.Release|x64.Build.0 = Release|x64
 		{5FE5CE96-F3CF-45F8-8B49-1A6EFE1F0808}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5FE5CE96-F3CF-45F8-8B49-1A6EFE1F0808}.Debug|Win32.Build.0 = Debug|Win32
-		{5FE5CE96-F3CF-45F8-8B49-1A6EFE1F0808}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{5FE5CE96-F3CF-45F8-8B49-1A6EFE1F0808}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{5FE5CE96-F3CF-45F8-8B49-1A6EFE1F0808}.Debug|x64.ActiveCfg = Debug|x64
+		{5FE5CE96-F3CF-45F8-8B49-1A6EFE1F0808}.Debug|x64.Build.0 = Debug|x64
 		{5FE5CE96-F3CF-45F8-8B49-1A6EFE1F0808}.Release|Win32.ActiveCfg = Release|Win32
 		{5FE5CE96-F3CF-45F8-8B49-1A6EFE1F0808}.Release|Win32.Build.0 = Release|Win32
+		{5FE5CE96-F3CF-45F8-8B49-1A6EFE1F0808}.Release|x64.ActiveCfg = Release|x64
+		{5FE5CE96-F3CF-45F8-8B49-1A6EFE1F0808}.Release|x64.Build.0 = Release|x64
 		{F41473DF-6208-4A84-9DEC-AEEA3B4185F2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F41473DF-6208-4A84-9DEC-AEEA3B4185F2}.Debug|Win32.Build.0 = Debug|Win32
-		{F41473DF-6208-4A84-9DEC-AEEA3B4185F2}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{F41473DF-6208-4A84-9DEC-AEEA3B4185F2}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{F41473DF-6208-4A84-9DEC-AEEA3B4185F2}.Debug|x64.ActiveCfg = Debug|x64
+		{F41473DF-6208-4A84-9DEC-AEEA3B4185F2}.Debug|x64.Build.0 = Debug|x64
 		{F41473DF-6208-4A84-9DEC-AEEA3B4185F2}.Release|Win32.ActiveCfg = Release|Win32
 		{F41473DF-6208-4A84-9DEC-AEEA3B4185F2}.Release|Win32.Build.0 = Release|Win32
+		{F41473DF-6208-4A84-9DEC-AEEA3B4185F2}.Release|x64.ActiveCfg = Release|x64
+		{F41473DF-6208-4A84-9DEC-AEEA3B4185F2}.Release|x64.Build.0 = Release|x64
 		{CB863D89-F181-4E81-9E48-E7690937C58C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB863D89-F181-4E81-9E48-E7690937C58C}.Debug|Win32.Build.0 = Debug|Win32
-		{CB863D89-F181-4E81-9E48-E7690937C58C}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{CB863D89-F181-4E81-9E48-E7690937C58C}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{CB863D89-F181-4E81-9E48-E7690937C58C}.Debug|x64.ActiveCfg = Debug|x64
+		{CB863D89-F181-4E81-9E48-E7690937C58C}.Debug|x64.Build.0 = Debug|x64
 		{CB863D89-F181-4E81-9E48-E7690937C58C}.Release|Win32.ActiveCfg = Release|Win32
 		{CB863D89-F181-4E81-9E48-E7690937C58C}.Release|Win32.Build.0 = Release|Win32
+		{CB863D89-F181-4E81-9E48-E7690937C58C}.Release|x64.ActiveCfg = Release|x64
+		{CB863D89-F181-4E81-9E48-E7690937C58C}.Release|x64.Build.0 = Release|x64
 		{451D3F58-1480-4D96-ABD5-A01BC535CE43}.Debug|Win32.ActiveCfg = Debug|Win32
 		{451D3F58-1480-4D96-ABD5-A01BC535CE43}.Debug|Win32.Build.0 = Debug|Win32
-		{451D3F58-1480-4D96-ABD5-A01BC535CE43}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{451D3F58-1480-4D96-ABD5-A01BC535CE43}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{451D3F58-1480-4D96-ABD5-A01BC535CE43}.Debug|x64.ActiveCfg = Debug|x64
+		{451D3F58-1480-4D96-ABD5-A01BC535CE43}.Debug|x64.Build.0 = Debug|x64
 		{451D3F58-1480-4D96-ABD5-A01BC535CE43}.Release|Win32.ActiveCfg = Release|Win32
 		{451D3F58-1480-4D96-ABD5-A01BC535CE43}.Release|Win32.Build.0 = Release|Win32
+		{451D3F58-1480-4D96-ABD5-A01BC535CE43}.Release|x64.ActiveCfg = Release|x64
+		{451D3F58-1480-4D96-ABD5-A01BC535CE43}.Release|x64.Build.0 = Release|x64
 		{CCC9A082-5BB8-4AE4-8D1B-242357B1BFD5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CCC9A082-5BB8-4AE4-8D1B-242357B1BFD5}.Debug|Win32.Build.0 = Debug|Win32
-		{CCC9A082-5BB8-4AE4-8D1B-242357B1BFD5}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{CCC9A082-5BB8-4AE4-8D1B-242357B1BFD5}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{CCC9A082-5BB8-4AE4-8D1B-242357B1BFD5}.Debug|x64.ActiveCfg = Debug|x64
+		{CCC9A082-5BB8-4AE4-8D1B-242357B1BFD5}.Debug|x64.Build.0 = Debug|x64
 		{CCC9A082-5BB8-4AE4-8D1B-242357B1BFD5}.Release|Win32.ActiveCfg = Release|Win32
 		{CCC9A082-5BB8-4AE4-8D1B-242357B1BFD5}.Release|Win32.Build.0 = Release|Win32
+		{CCC9A082-5BB8-4AE4-8D1B-242357B1BFD5}.Release|x64.ActiveCfg = Release|x64
+		{CCC9A082-5BB8-4AE4-8D1B-242357B1BFD5}.Release|x64.Build.0 = Release|x64
 		{36FBD6C9-AA46-4B4E-A168-82274DA2A01E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{36FBD6C9-AA46-4B4E-A168-82274DA2A01E}.Debug|Win32.Build.0 = Debug|Win32
-		{36FBD6C9-AA46-4B4E-A168-82274DA2A01E}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{36FBD6C9-AA46-4B4E-A168-82274DA2A01E}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{36FBD6C9-AA46-4B4E-A168-82274DA2A01E}.Debug|x64.ActiveCfg = Debug|x64
+		{36FBD6C9-AA46-4B4E-A168-82274DA2A01E}.Debug|x64.Build.0 = Debug|x64
 		{36FBD6C9-AA46-4B4E-A168-82274DA2A01E}.Release|Win32.ActiveCfg = Release|Win32
 		{36FBD6C9-AA46-4B4E-A168-82274DA2A01E}.Release|Win32.Build.0 = Release|Win32
+		{36FBD6C9-AA46-4B4E-A168-82274DA2A01E}.Release|x64.ActiveCfg = Release|x64
+		{36FBD6C9-AA46-4B4E-A168-82274DA2A01E}.Release|x64.Build.0 = Release|x64
 		{811E8D52-A70D-46E8-A041-6EB6414D419C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{811E8D52-A70D-46E8-A041-6EB6414D419C}.Debug|Win32.Build.0 = Debug|Win32
-		{811E8D52-A70D-46E8-A041-6EB6414D419C}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{811E8D52-A70D-46E8-A041-6EB6414D419C}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{811E8D52-A70D-46E8-A041-6EB6414D419C}.Debug|x64.ActiveCfg = Debug|x64
+		{811E8D52-A70D-46E8-A041-6EB6414D419C}.Debug|x64.Build.0 = Debug|x64
 		{811E8D52-A70D-46E8-A041-6EB6414D419C}.Release|Win32.ActiveCfg = Release|Win32
 		{811E8D52-A70D-46E8-A041-6EB6414D419C}.Release|Win32.Build.0 = Release|Win32
+		{811E8D52-A70D-46E8-A041-6EB6414D419C}.Release|x64.ActiveCfg = Release|x64
+		{811E8D52-A70D-46E8-A041-6EB6414D419C}.Release|x64.Build.0 = Release|x64
 		{3DDBE733-0C6D-4C78-BED3-9BBA327754BD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3DDBE733-0C6D-4C78-BED3-9BBA327754BD}.Debug|Win32.Build.0 = Debug|Win32
-		{3DDBE733-0C6D-4C78-BED3-9BBA327754BD}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{3DDBE733-0C6D-4C78-BED3-9BBA327754BD}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{3DDBE733-0C6D-4C78-BED3-9BBA327754BD}.Debug|x64.ActiveCfg = Debug|x64
+		{3DDBE733-0C6D-4C78-BED3-9BBA327754BD}.Debug|x64.Build.0 = Debug|x64
 		{3DDBE733-0C6D-4C78-BED3-9BBA327754BD}.Release|Win32.ActiveCfg = Release|Win32
 		{3DDBE733-0C6D-4C78-BED3-9BBA327754BD}.Release|Win32.Build.0 = Release|Win32
+		{3DDBE733-0C6D-4C78-BED3-9BBA327754BD}.Release|x64.ActiveCfg = Release|x64
+		{3DDBE733-0C6D-4C78-BED3-9BBA327754BD}.Release|x64.Build.0 = Release|x64
 		{065C0817-2A3F-4B0A-93D2-DB891A451B35}.Debug|Win32.ActiveCfg = Debug|Win32
 		{065C0817-2A3F-4B0A-93D2-DB891A451B35}.Debug|Win32.Build.0 = Debug|Win32
-		{065C0817-2A3F-4B0A-93D2-DB891A451B35}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{065C0817-2A3F-4B0A-93D2-DB891A451B35}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{065C0817-2A3F-4B0A-93D2-DB891A451B35}.Debug|x64.ActiveCfg = Debug|x64
+		{065C0817-2A3F-4B0A-93D2-DB891A451B35}.Debug|x64.Build.0 = Debug|x64
 		{065C0817-2A3F-4B0A-93D2-DB891A451B35}.Release|Win32.ActiveCfg = Release|Win32
 		{065C0817-2A3F-4B0A-93D2-DB891A451B35}.Release|Win32.Build.0 = Release|Win32
+		{065C0817-2A3F-4B0A-93D2-DB891A451B35}.Release|x64.ActiveCfg = Release|x64
+		{065C0817-2A3F-4B0A-93D2-DB891A451B35}.Release|x64.Build.0 = Release|x64
 		{67103626-AC3F-49B8-98C1-C78FB1A9F510}.Debug|Win32.ActiveCfg = Debug|Win32
 		{67103626-AC3F-49B8-98C1-C78FB1A9F510}.Debug|Win32.Build.0 = Debug|Win32
-		{67103626-AC3F-49B8-98C1-C78FB1A9F510}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{67103626-AC3F-49B8-98C1-C78FB1A9F510}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{67103626-AC3F-49B8-98C1-C78FB1A9F510}.Debug|x64.ActiveCfg = Debug|x64
+		{67103626-AC3F-49B8-98C1-C78FB1A9F510}.Debug|x64.Build.0 = Debug|x64
 		{67103626-AC3F-49B8-98C1-C78FB1A9F510}.Release|Win32.ActiveCfg = Release|Win32
 		{67103626-AC3F-49B8-98C1-C78FB1A9F510}.Release|Win32.Build.0 = Release|Win32
+		{67103626-AC3F-49B8-98C1-C78FB1A9F510}.Release|x64.ActiveCfg = Release|x64
+		{67103626-AC3F-49B8-98C1-C78FB1A9F510}.Release|x64.Build.0 = Release|x64
 		{06D7EA7F-3B1B-46E0-BBAA-4D7E41DEC929}.Debug|Win32.ActiveCfg = Debug|Win32
 		{06D7EA7F-3B1B-46E0-BBAA-4D7E41DEC929}.Debug|Win32.Build.0 = Debug|Win32
-		{06D7EA7F-3B1B-46E0-BBAA-4D7E41DEC929}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{06D7EA7F-3B1B-46E0-BBAA-4D7E41DEC929}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{06D7EA7F-3B1B-46E0-BBAA-4D7E41DEC929}.Debug|x64.ActiveCfg = Debug|x64
+		{06D7EA7F-3B1B-46E0-BBAA-4D7E41DEC929}.Debug|x64.Build.0 = Debug|x64
 		{06D7EA7F-3B1B-46E0-BBAA-4D7E41DEC929}.Release|Win32.ActiveCfg = Release|Win32
 		{06D7EA7F-3B1B-46E0-BBAA-4D7E41DEC929}.Release|Win32.Build.0 = Release|Win32
+		{06D7EA7F-3B1B-46E0-BBAA-4D7E41DEC929}.Release|x64.ActiveCfg = Release|x64
+		{06D7EA7F-3B1B-46E0-BBAA-4D7E41DEC929}.Release|x64.Build.0 = Release|x64
 		{1D902586-5B5E-41CA-B74C-E9A1A9817527}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1D902586-5B5E-41CA-B74C-E9A1A9817527}.Debug|Win32.Build.0 = Debug|Win32
-		{1D902586-5B5E-41CA-B74C-E9A1A9817527}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{1D902586-5B5E-41CA-B74C-E9A1A9817527}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{1D902586-5B5E-41CA-B74C-E9A1A9817527}.Debug|x64.ActiveCfg = Debug|x64
+		{1D902586-5B5E-41CA-B74C-E9A1A9817527}.Debug|x64.Build.0 = Debug|x64
 		{1D902586-5B5E-41CA-B74C-E9A1A9817527}.Release|Win32.ActiveCfg = Release|Win32
 		{1D902586-5B5E-41CA-B74C-E9A1A9817527}.Release|Win32.Build.0 = Release|Win32
+		{1D902586-5B5E-41CA-B74C-E9A1A9817527}.Release|x64.ActiveCfg = Release|x64
+		{1D902586-5B5E-41CA-B74C-E9A1A9817527}.Release|x64.Build.0 = Release|x64
 		{9878FFC6-CC96-40B6-BEA0-29A4EA4A24E2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9878FFC6-CC96-40B6-BEA0-29A4EA4A24E2}.Debug|Win32.Build.0 = Debug|Win32
-		{9878FFC6-CC96-40B6-BEA0-29A4EA4A24E2}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{9878FFC6-CC96-40B6-BEA0-29A4EA4A24E2}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{9878FFC6-CC96-40B6-BEA0-29A4EA4A24E2}.Debug|x64.ActiveCfg = Debug|x64
+		{9878FFC6-CC96-40B6-BEA0-29A4EA4A24E2}.Debug|x64.Build.0 = Debug|x64
 		{9878FFC6-CC96-40B6-BEA0-29A4EA4A24E2}.Release|Win32.ActiveCfg = Release|Win32
 		{9878FFC6-CC96-40B6-BEA0-29A4EA4A24E2}.Release|Win32.Build.0 = Release|Win32
+		{9878FFC6-CC96-40B6-BEA0-29A4EA4A24E2}.Release|x64.ActiveCfg = Release|x64
+		{9878FFC6-CC96-40B6-BEA0-29A4EA4A24E2}.Release|x64.Build.0 = Release|x64
 		{66BE596B-7BB8-4C96-87DB-714AC31D4A39}.Debug|Win32.ActiveCfg = Debug|Win32
 		{66BE596B-7BB8-4C96-87DB-714AC31D4A39}.Debug|Win32.Build.0 = Debug|Win32
-		{66BE596B-7BB8-4C96-87DB-714AC31D4A39}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{66BE596B-7BB8-4C96-87DB-714AC31D4A39}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{66BE596B-7BB8-4C96-87DB-714AC31D4A39}.Debug|x64.ActiveCfg = Debug|x64
+		{66BE596B-7BB8-4C96-87DB-714AC31D4A39}.Debug|x64.Build.0 = Debug|x64
 		{66BE596B-7BB8-4C96-87DB-714AC31D4A39}.Release|Win32.ActiveCfg = Release|Win32
 		{66BE596B-7BB8-4C96-87DB-714AC31D4A39}.Release|Win32.Build.0 = Release|Win32
+		{66BE596B-7BB8-4C96-87DB-714AC31D4A39}.Release|x64.ActiveCfg = Release|x64
+		{66BE596B-7BB8-4C96-87DB-714AC31D4A39}.Release|x64.Build.0 = Release|x64
 		{FFF75001-7B36-47E8-99DC-ABA8BE82F996}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FFF75001-7B36-47E8-99DC-ABA8BE82F996}.Debug|Win32.Build.0 = Debug|Win32
-		{FFF75001-7B36-47E8-99DC-ABA8BE82F996}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{FFF75001-7B36-47E8-99DC-ABA8BE82F996}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{FFF75001-7B36-47E8-99DC-ABA8BE82F996}.Debug|x64.ActiveCfg = Debug|x64
+		{FFF75001-7B36-47E8-99DC-ABA8BE82F996}.Debug|x64.Build.0 = Debug|x64
 		{FFF75001-7B36-47E8-99DC-ABA8BE82F996}.Release|Win32.ActiveCfg = Release|Win32
 		{FFF75001-7B36-47E8-99DC-ABA8BE82F996}.Release|Win32.Build.0 = Release|Win32
+		{FFF75001-7B36-47E8-99DC-ABA8BE82F996}.Release|x64.ActiveCfg = Release|x64
+		{FFF75001-7B36-47E8-99DC-ABA8BE82F996}.Release|x64.Build.0 = Release|x64
 		{9C7FB0A8-138B-4732-905F-3EDC00C0D52F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9C7FB0A8-138B-4732-905F-3EDC00C0D52F}.Debug|Win32.Build.0 = Debug|Win32
-		{9C7FB0A8-138B-4732-905F-3EDC00C0D52F}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{9C7FB0A8-138B-4732-905F-3EDC00C0D52F}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{9C7FB0A8-138B-4732-905F-3EDC00C0D52F}.Debug|x64.ActiveCfg = Debug|x64
+		{9C7FB0A8-138B-4732-905F-3EDC00C0D52F}.Debug|x64.Build.0 = Debug|x64
 		{9C7FB0A8-138B-4732-905F-3EDC00C0D52F}.Release|Win32.ActiveCfg = Release|Win32
 		{9C7FB0A8-138B-4732-905F-3EDC00C0D52F}.Release|Win32.Build.0 = Release|Win32
+		{9C7FB0A8-138B-4732-905F-3EDC00C0D52F}.Release|x64.ActiveCfg = Release|x64
+		{9C7FB0A8-138B-4732-905F-3EDC00C0D52F}.Release|x64.Build.0 = Release|x64
 		{16AD2005-39BA-4E52-A2C6-F5C3C56901FC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{16AD2005-39BA-4E52-A2C6-F5C3C56901FC}.Debug|Win32.Build.0 = Debug|Win32
-		{16AD2005-39BA-4E52-A2C6-F5C3C56901FC}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{16AD2005-39BA-4E52-A2C6-F5C3C56901FC}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{16AD2005-39BA-4E52-A2C6-F5C3C56901FC}.Debug|x64.ActiveCfg = Debug|x64
+		{16AD2005-39BA-4E52-A2C6-F5C3C56901FC}.Debug|x64.Build.0 = Debug|x64
 		{16AD2005-39BA-4E52-A2C6-F5C3C56901FC}.Release|Win32.ActiveCfg = Release|Win32
 		{16AD2005-39BA-4E52-A2C6-F5C3C56901FC}.Release|Win32.Build.0 = Release|Win32
+		{16AD2005-39BA-4E52-A2C6-F5C3C56901FC}.Release|x64.ActiveCfg = Release|x64
+		{16AD2005-39BA-4E52-A2C6-F5C3C56901FC}.Release|x64.Build.0 = Release|x64
 		{8C50630B-96F5-46EC-B867-BABB36146AE8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8C50630B-96F5-46EC-B867-BABB36146AE8}.Debug|Win32.Build.0 = Debug|Win32
-		{8C50630B-96F5-46EC-B867-BABB36146AE8}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{8C50630B-96F5-46EC-B867-BABB36146AE8}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{8C50630B-96F5-46EC-B867-BABB36146AE8}.Debug|x64.ActiveCfg = Debug|x64
+		{8C50630B-96F5-46EC-B867-BABB36146AE8}.Debug|x64.Build.0 = Debug|x64
 		{8C50630B-96F5-46EC-B867-BABB36146AE8}.Release|Win32.ActiveCfg = Release|Win32
 		{8C50630B-96F5-46EC-B867-BABB36146AE8}.Release|Win32.Build.0 = Release|Win32
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}.Debug|Win32.Build.0 = Debug|Win32
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}.Release|Win32.ActiveCfg = Release|Win32
-		{E1D6306E-4FF8-474A-BE7F-45DCBA4888B6}.Release|Win32.Build.0 = Release|Win32
+		{8C50630B-96F5-46EC-B867-BABB36146AE8}.Release|x64.ActiveCfg = Release|x64
+		{8C50630B-96F5-46EC-B867-BABB36146AE8}.Release|x64.Build.0 = Release|x64
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8}.Debug|Win32.Build.0 = Debug|Win32
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8}.Debug|x64.ActiveCfg = Debug|x64
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8}.Debug|x64.Build.0 = Debug|x64
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8}.Release|Win32.ActiveCfg = Release|Win32
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8}.Release|Win32.Build.0 = Release|Win32
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8}.Release|x64.ActiveCfg = Release|x64
+		{755AD11C-80B9-4E33-9D3D-9A68884A3EC8}.Release|x64.Build.0 = Release|x64
 		{A76258B4-BAE5-4FAA-B5E3-DB7BE7B43760}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A76258B4-BAE5-4FAA-B5E3-DB7BE7B43760}.Debug|Win32.Build.0 = Debug|Win32
-		{A76258B4-BAE5-4FAA-B5E3-DB7BE7B43760}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{A76258B4-BAE5-4FAA-B5E3-DB7BE7B43760}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{A76258B4-BAE5-4FAA-B5E3-DB7BE7B43760}.Debug|x64.ActiveCfg = Debug|x64
+		{A76258B4-BAE5-4FAA-B5E3-DB7BE7B43760}.Debug|x64.Build.0 = Debug|x64
 		{A76258B4-BAE5-4FAA-B5E3-DB7BE7B43760}.Release|Win32.ActiveCfg = Release|Win32
 		{A76258B4-BAE5-4FAA-B5E3-DB7BE7B43760}.Release|Win32.Build.0 = Release|Win32
+		{A76258B4-BAE5-4FAA-B5E3-DB7BE7B43760}.Release|x64.ActiveCfg = Release|x64
+		{A76258B4-BAE5-4FAA-B5E3-DB7BE7B43760}.Release|x64.Build.0 = Release|x64
 		{DA7D35BC-F602-4AAC-BF4E-0BF5ED3B9761}.Debug|Win32.ActiveCfg = Debug|Win32
 		{DA7D35BC-F602-4AAC-BF4E-0BF5ED3B9761}.Debug|Win32.Build.0 = Debug|Win32
-		{DA7D35BC-F602-4AAC-BF4E-0BF5ED3B9761}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{DA7D35BC-F602-4AAC-BF4E-0BF5ED3B9761}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
+		{DA7D35BC-F602-4AAC-BF4E-0BF5ED3B9761}.Debug|x64.ActiveCfg = Debug|x64
+		{DA7D35BC-F602-4AAC-BF4E-0BF5ED3B9761}.Debug|x64.Build.0 = Debug|x64
 		{DA7D35BC-F602-4AAC-BF4E-0BF5ED3B9761}.Release|Win32.ActiveCfg = Release|Win32
 		{DA7D35BC-F602-4AAC-BF4E-0BF5ED3B9761}.Release|Win32.Build.0 = Release|Win32
-		{C5513096-5115-434E-9785-4D1DEC12EB2B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C5513096-5115-434E-9785-4D1DEC12EB2B}.Debug|Win32.Build.0 = Debug|Win32
-		{C5513096-5115-434E-9785-4D1DEC12EB2B}.Release with symbols|Win32.ActiveCfg = Release with symbols|Win32
-		{C5513096-5115-434E-9785-4D1DEC12EB2B}.Release with symbols|Win32.Build.0 = Release with symbols|Win32
-		{C5513096-5115-434E-9785-4D1DEC12EB2B}.Release|Win32.ActiveCfg = Release|Win32
-		{C5513096-5115-434E-9785-4D1DEC12EB2B}.Release|Win32.Build.0 = Release|Win32
+		{DA7D35BC-F602-4AAC-BF4E-0BF5ED3B9761}.Release|x64.ActiveCfg = Release|x64
+		{DA7D35BC-F602-4AAC-BF4E-0BF5ED3B9761}.Release|x64.Build.0 = Release|x64
+		{FDDF7AB6-F714-4C89-869C-8919D26403AA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FDDF7AB6-F714-4C89-869C-8919D26403AA}.Debug|Win32.Build.0 = Debug|Win32
+		{FDDF7AB6-F714-4C89-869C-8919D26403AA}.Debug|x64.ActiveCfg = Debug|x64
+		{FDDF7AB6-F714-4C89-869C-8919D26403AA}.Debug|x64.Build.0 = Debug|x64
+		{FDDF7AB6-F714-4C89-869C-8919D26403AA}.Release|Win32.ActiveCfg = Release|Win32
+		{FDDF7AB6-F714-4C89-869C-8919D26403AA}.Release|Win32.Build.0 = Release|Win32
+		{FDDF7AB6-F714-4C89-869C-8919D26403AA}.Release|x64.ActiveCfg = Release|x64
+		{FDDF7AB6-F714-4C89-869C-8919D26403AA}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC8/XalanTransform/XalanTransform.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC8/XalanTransform/XalanTransform.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC8/XalanTransform/XalanTransform.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC8/XalanTransform/XalanTransform.vcproj Wed Dec 12 17:25:38 2007
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -41,7 +44,6 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -68,7 +70,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_3D.lib "
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC8\Debug;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC8\Debug,..\..\..\..\Build\Win32\VC8\Debug"
+				AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC8\Debug;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC8\Debug;$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -99,6 +101,90 @@
 			/>
 		</Configuration>
 		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\..\..\Build\Win64\VC8\Debug"
+			IntermediateDirectory="$(OutDir)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include"
+				PreprocessorDefinitions=""
+				StringPooling="true"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_3D.lib "
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win64\VC8\Debug;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC8\Debug;$(OutDir)"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\..\..\..\Build\Win32\VC8\Release"
 			IntermediateDirectory="$(OutDir)\$(ProjectName)"
@@ -129,14 +215,14 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="0"
+				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4996"
 			/>
@@ -153,7 +239,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_3.lib "
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC8\Release;$(XERCESCROOT)\lib..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC8\Release,..\..\..\..\Build\Win32\VC8\Release"
+				AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC8\Release;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC8\Release;$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -186,8 +272,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release with symbols|Win32"
-			OutputDirectory="..\..\..\..\Build\Win32\VC8\Release.symbols"
+			Name="Release|x64"
+			OutputDirectory="..\..\..\..\Build\Win64\VC8\Release"
 			IntermediateDirectory="$(OutDir)\$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="0"
@@ -207,6 +293,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -216,7 +303,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
@@ -240,12 +327,12 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_3.lib "
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC8\Release;$(XERCESCROOT)\lib..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC8\Release,..\..\..\..\Build\Win32\VC8\Release"
+				AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win64\VC8\Release;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC8\Release;$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC8/XalanTransformerCallback/XalanTransformerCallback.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC8/XalanTransformerCallback/XalanTransformerCallback.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC8/XalanTransformerCallback/XalanTransformerCallback.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Projects/Win32/VC8/XalanTransformerCallback/XalanTransformerCallback.vcproj Wed Dec 12 17:25:38 2007
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -41,7 +44,6 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				StringPooling="true"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -68,7 +70,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_3D.lib "
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC8\Debug;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC8\Debug,..\..\..\..\Build\Win32\VC8\Debug"
+				AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC8\Debug;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC8\Debug;$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -99,6 +101,90 @@
 			/>
 		</Configuration>
 		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\..\..\Build\Win64\VC8\Debug"
+			IntermediateDirectory="$(OutDir)\$(ProjectName)"
+			ConfigurationType="1"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include"
+				PreprocessorDefinitions=""
+				StringPooling="true"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+				DisableSpecificWarnings="4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="xerces-c_3D.lib "
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win64\VC8\Debug;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC8\Debug;$(OutDir)"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\..\..\..\Build\Win32\VC8\Release"
 			IntermediateDirectory="$(OutDir)\$(ProjectName)"
@@ -129,14 +215,14 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="0"
+				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4996"
 			/>
@@ -153,7 +239,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_3.lib "
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC8\Release;$(XERCESCROOT)\lib..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC8\Release,..\..\..\..\Build\Win32\VC8\Release"
+				AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC8\Release;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC8\Release;$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -186,8 +272,8 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release with symbols|Win32"
-			OutputDirectory="..\..\..\..\Build\Win32\VC8\Release.symbols"
+			Name="Release|x64"
+			OutputDirectory="..\..\..\..\Build\Win64\VC8\Release"
 			IntermediateDirectory="$(OutDir)\$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="0"
@@ -207,6 +293,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -216,7 +303,7 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\..\xml-xerces\c\src;..\..\..\..\src\;$(OutDir)\Nls\Include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
@@ -240,12 +327,12 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="xerces-c_3.lib "
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC8\Release;$(XERCESCROOT)\lib..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC8\Release,..\..\..\..\Build\Win32\VC8\Release"
+				AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win64\VC8\Release;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC8\Release;$(OutDir)"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Tests/C-API/CAPI.dsp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Tests/C-API/CAPI.dsp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Tests/C-API/CAPI.dsp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Tests/C-API/CAPI.dsp Wed Dec 12 17:25:38 2007
@@ -43,8 +43,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Release\CAPI"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -68,8 +68,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Debug\CAPI"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -92,8 +92,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win64\VC6\Release\CAPI"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN64" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -117,8 +117,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win64\VC6\Debug\CAPI"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN64" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Tests/C-API/CAPI.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Tests/C-API/CAPI.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Tests/C-API/CAPI.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Tests/C-API/CAPI.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -75,7 +75,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
+				PreprocessorDefinitions=""
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="TRUE"

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Compare/compare.dsp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Compare/compare.dsp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Compare/compare.dsp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Compare/compare.dsp Wed Dec 12 17:25:38 2007
@@ -44,8 +44,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Release\compare"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -69,8 +69,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Debug\compare"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_WINDOWS" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -94,8 +94,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Release.symbols\compare"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -120,8 +120,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win64\VC6\Release\compare"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN64" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -145,8 +145,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win64\VC6\Debug\compare"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN64" /D "_WINDOWS" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Compare/compare.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Compare/compare.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Compare/compare.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Compare/compare.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -76,7 +76,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="_WINDOWS,_CONSOLE,WIN32,_DEBUG"
+				PreprocessorDefinitions=""
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="TRUE"
@@ -132,7 +132,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Conf/conf.dsp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Conf/conf.dsp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Conf/conf.dsp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Conf/conf.dsp Wed Dec 12 17:25:38 2007
@@ -44,8 +44,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Release\conf"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -69,8 +69,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\debug\conf"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_WINDOWS" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -94,8 +94,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Release.symbols\conf"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -120,8 +120,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win64\VC6\Release\conf"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN64" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -145,8 +145,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win64\VC6\debug\conf"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN64" /D "_WINDOWS" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Conf/conf.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Conf/conf.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Conf/conf.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Conf/conf.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="_WINDOWS,_CONSOLE,WIN32,_DEBUG"
+				PreprocessorDefinitions=""
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="TRUE"
@@ -78,7 +78,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -132,7 +132,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Dom2Dom/Dom2Dom.dsp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Dom2Dom/Dom2Dom.dsp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Dom2Dom/Dom2Dom.dsp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Dom2Dom/Dom2Dom.dsp Wed Dec 12 17:25:38 2007
@@ -44,8 +44,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Release\dom2dom"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -69,8 +69,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\debug\dom2dom"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_WINDOWS" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -94,8 +94,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Release.symbols\dom2dom"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -119,8 +119,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win64\VC6\Release\dom2dom"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN64" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -144,8 +144,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win64\VC6\debug\dom2dom"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN64" /D "_WINDOWS" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Dom2Dom/Dom2Dom.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Dom2Dom/Dom2Dom.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Dom2Dom/Dom2Dom.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Dom2Dom/Dom2Dom.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="_WINDOWS,_CONSOLE,WIN32,_DEBUG"
+				PreprocessorDefinitions=""
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
 				RuntimeTypeInfo="TRUE"
@@ -78,7 +78,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -135,7 +135,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Errortests/Errortests.dsp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Errortests/Errortests.dsp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Errortests/Errortests.dsp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Errortests/Errortests.dsp Wed Dec 12 17:25:38 2007
@@ -44,8 +44,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Release\Errortests"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -69,8 +69,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\debug\Errortests"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_WINDOWS" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -94,8 +94,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Release.symbols\Errortests"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -120,8 +120,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win64\VC6\Release\Errortests"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN64" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -145,8 +145,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win64\VC6\debug\Errortests"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN64" /D "_WINDOWS" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Errortests/Errortests.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Errortests/Errortests.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Errortests/Errortests.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Errortests/Errortests.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -79,7 +79,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -133,7 +133,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="_WINDOWS,_CONSOLE,WIN32,_DEBUG"
+				PreprocessorDefinitions=""
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				RuntimeTypeInfo="TRUE"

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Extensions/extensions.dsp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Extensions/extensions.dsp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Extensions/extensions.dsp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Extensions/extensions.dsp Wed Dec 12 17:25:38 2007
@@ -44,8 +44,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Release\extensions"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -69,8 +69,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\debug\extensions"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_WINDOWS" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -94,8 +94,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Release.symbols\extensions"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -119,8 +119,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win64\VC6\Release\extensions"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN64" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -144,8 +144,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win64\VC6\debug\extensions"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN64" /D "_WINDOWS" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Extensions/extensions.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Extensions/extensions.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Extensions/extensions.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Tests/Extensions/extensions.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -76,7 +76,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="_WINDOWS,_CONSOLE,WIN32,_DEBUG"
+				PreprocessorDefinitions=""
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
 				RuntimeTypeInfo="TRUE"
@@ -132,7 +132,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Tests/InputSource/inputsource.dsp
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Tests/InputSource/inputsource.dsp?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Tests/InputSource/inputsource.dsp (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Tests/InputSource/inputsource.dsp Wed Dec 12 17:25:38 2007
@@ -44,8 +44,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Release\inputsource"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /Zm250 /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /Zm250 /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -68,8 +68,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\debug\inputsource"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_WINDOWS" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /Zm250 /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /Zm250 /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -93,8 +93,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win32\VC6\Release.symbols\inputsource"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /Zm250 /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I "..\harness\\" /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /Zm250 /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -117,8 +117,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win64\VC6\Release\inputsource"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN64" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "NDEBUG" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -142,8 +142,8 @@
 # PROP Intermediate_Dir "..\..\Build\Win64\VC6\debug\inputsource"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "WIN64" /D "_WINDOWS" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W4 /GR /GX /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\" /I ".." /I "$(XERCESCROOT)\src" /I "$(XERCESCROOT)\include" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe

Modified: xalan/c/branches/dbertoni/VisualStudioFixup/Tests/InputSource/inputsource.vcproj
URL: http://svn.apache.org/viewvc/xalan/c/branches/dbertoni/VisualStudioFixup/Tests/InputSource/inputsource.vcproj?rev=603798&r1=603797&r2=603798&view=diff
==============================================================================
--- xalan/c/branches/dbertoni/VisualStudioFixup/Tests/InputSource/inputsource.vcproj (original)
+++ xalan/c/branches/dbertoni/VisualStudioFixup/Tests/InputSource/inputsource.vcproj Wed Dec 12 17:25:38 2007
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -79,7 +79,7 @@
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
+				PreprocessorDefinitions="NDEBUG"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="TRUE"
@@ -133,7 +133,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\xml-xerces\c\src,..\..\src\,..;$(XERCESCROOT)\include;$(XERCESCROOT)\src"
-				PreprocessorDefinitions="_WINDOWS,_CONSOLE,WIN32,_DEBUG"
+				PreprocessorDefinitions=""
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
 				RuntimeTypeInfo="TRUE"



---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org