Move a bunch of libs over to gyp on windows.

Review URL: http://codereview.chromium.org/60019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13020 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 20 insertions, 1303 deletions

diff --git a/build/all.gyp b/build/all.gyp
index 3142a6b..2d9ddff 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -25,6 +25,18 @@
         '../media/media.gyp:*',
         '../net/net.gyp:*',
         '../printing/printing.gyp:*',
+        '../sdch/sdch.gyp:*',
+        '../skia/skia.gyp:*',
+        '../third_party/bzip2/bzip2.gyp:*',
+        '../third_party/icu38/icu38.gyp:*',
+        '../third_party/libjpeg/libjpeg.gyp:*',
+        '../third_party/libpng/libpng.gyp:*',
+        '../third_party/libxml/libxml.gyp:*',
+        '../third_party/libxslt/libxslt.gyp:*',
+        '../third_party/modp_b64/modp_b64.gyp:*',
+        '../third_party/npapi/npapi.gyp:*',
+        '../third_party/sqlite/sqlite.gyp:*',
+        '../third_party/zlib/zlib.gyp:*',
       ],
       'conditions': [
         ['OS=="linux"', {
@@ -36,24 +48,15 @@
           'dependencies': [
             '../sandbox/sandbox.gyp:*',
           ],
+        }, {
+          'dependencies': [
+            '../third_party/libevent/libevent.gyp:*',
+          ],
         }],
         ['all_gyps', {
           'dependencies': [
             '../chrome/chrome.gyp:*',
-            '../sdch/sdch.gyp:*',
-            '../skia/skia.gyp:*',
             '../testing/gtest.gyp:*',
-            '../third_party/bzip2/bzip2.gyp:*',
-            '../third_party/icu38/icu38.gyp:*',
-            '../third_party/libevent/libevent.gyp:*',
-            '../third_party/libjpeg/libjpeg.gyp:*',
-            '../third_party/libpng/libpng.gyp:*',
-            '../third_party/libxml/libxml.gyp:*',
-            '../third_party/libxslt/libxslt.gyp:*',
-            '../third_party/modp_b64/modp_b64.gyp:*',
-            '../third_party/npapi/npapi.gyp:*',
-            '../third_party/sqlite/sqlite.gyp:*',
-            '../third_party/zlib/zlib.gyp:*',
             '../webkit/tools/test_shell/test_shell.gyp:*',
             '../webkit/webkit.gyp:*',
             'temp_gyp/googleurl.gyp:*',
diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 4732ec4..f5a9607 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -117,11 +117,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "breakpad_handler", "..\brea
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "breakpad_sender", "..\breakpad\breakpad_sender.vcproj", "{9946A048-043B-4F8F-9E07-9297B204714C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml", "..\third_party\libxml\build\libxml.vcproj", "{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml", "..\third_party\libxml\libxml.vcproj", "{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hunspell", "third_party\hunspell\hunspell.vcproj", "{D5E8DCB2-9C61-446F-8BEE-B18CA0E0936E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\third_party\libxslt\build\libxslt.vcproj", "{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\third_party\libxslt\libxslt.vcproj", "{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
 	EndProjectSection
diff --git a/third_party/libxml/build/libxml.vcproj b/third_party/libxml/build/libxml.vcproj
deleted file mode 100644
index 2c052d3..0000000
--- a/third_party/libxml/build/libxml.vcproj
+++ /dev/null
@@ -1,519 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libxml"
-	ProjectGUID="{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}"
-	RootNamespace="libxml"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\libxml.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\libxml.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="include"
-			>
-			<File
-				RelativePath="..\include\win32config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\include\wsockcompat.h"
-				>
-			</File>
-			<Filter
-				Name="libxml"
-				>
-				<File
-					RelativePath="..\include\libxml\c14n.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\catalog.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\chvalid.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\debugXML.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\dict.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\DOCBparser.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\encoding.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\entities.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\globals.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\hash.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\HTMLparser.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\HTMLtree.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\list.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\nanoftp.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\nanohttp.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\parser.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\parserInternals.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\pattern.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\relaxng.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\SAX.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\SAX2.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\schemasInternals.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\schematron.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\threads.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\tree.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\uri.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\valid.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xinclude.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xlink.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xmlautomata.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xmlerror.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xmlexports.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xmlIO.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xmlmemory.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xmlmodule.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xmlreader.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xmlregexp.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xmlsave.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xmlschemas.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xmlschemastypes.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xmlstring.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xmlunicode.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xmlversion.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xmlwriter.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xpath.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xpathInternals.h"
-					>
-				</File>
-				<File
-					RelativePath="..\include\libxml\xpointer.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<File
-			RelativePath="..\acconfig.h"
-			>
-		</File>
-		<File
-			RelativePath="..\c14n.c"
-			>
-		</File>
-		<File
-			RelativePath="..\catalog.c"
-			>
-		</File>
-		<File
-			RelativePath="..\chvalid.c"
-			>
-		</File>
-		<File
-			RelativePath="..\config.h"
-			>
-		</File>
-		<File
-			RelativePath="..\debugXML.c"
-			>
-		</File>
-		<File
-			RelativePath="..\dict.c"
-			>
-		</File>
-		<File
-			RelativePath="..\DOCBparser.c"
-			>
-		</File>
-		<File
-			RelativePath="..\elfgcchack.h"
-			>
-		</File>
-		<File
-			RelativePath="..\encoding.c"
-			>
-		</File>
-		<File
-			RelativePath="..\entities.c"
-			>
-		</File>
-		<File
-			RelativePath="..\error.c"
-			>
-		</File>
-		<File
-			RelativePath="..\globals.c"
-			>
-		</File>
-		<File
-			RelativePath="..\hash.c"
-			>
-		</File>
-		<File
-			RelativePath="..\HTMLparser.c"
-			>
-		</File>
-		<File
-			RelativePath="..\HTMLtree.c"
-			>
-		</File>
-		<File
-			RelativePath="..\legacy.c"
-			>
-		</File>
-		<File
-			RelativePath="..\libxml.h"
-			>
-		</File>
-		<File
-			RelativePath="..\list.c"
-			>
-		</File>
-		<File
-			RelativePath="..\nanoftp.c"
-			>
-		</File>
-		<File
-			RelativePath="..\nanohttp.c"
-			>
-		</File>
-		<File
-			RelativePath="..\parser.c"
-			>
-		</File>
-		<File
-			RelativePath="..\parserInternals.c"
-			>
-		</File>
-		<File
-			RelativePath="..\pattern.c"
-			>
-		</File>
-		<File
-			RelativePath="..\relaxng.c"
-			>
-		</File>
-		<File
-			RelativePath="..\SAX.c"
-			>
-		</File>
-		<File
-			RelativePath="..\SAX2.c"
-			>
-		</File>
-		<File
-			RelativePath="..\schematron.c"
-			>
-		</File>
-		<File
-			RelativePath="..\threads.c"
-			>
-		</File>
-		<File
-			RelativePath="..\tree.c"
-			>
-		</File>
-		<File
-			RelativePath="..\uri.c"
-			>
-		</File>
-		<File
-			RelativePath="..\valid.c"
-			>
-		</File>
-		<File
-			RelativePath="..\xinclude.c"
-			>
-		</File>
-		<File
-			RelativePath="..\xlink.c"
-			>
-		</File>
-		<File
-			RelativePath="..\xmlIO.c"
-			>
-		</File>
-		<File
-			RelativePath="..\xmlmemory.c"
-			>
-		</File>
-		<File
-			RelativePath="..\xmlmodule.c"
-			>
-		</File>
-		<File
-			RelativePath="..\xmlreader.c"
-			>
-		</File>
-		<File
-			RelativePath="..\xmlregexp.c"
-			>
-		</File>
-		<File
-			RelativePath="..\xmlsave.c"
-			>
-		</File>
-		<File
-			RelativePath="..\xmlschemas.c"
-			>
-		</File>
-		<File
-			RelativePath="..\xmlschemastypes.c"
-			>
-		</File>
-		<File
-			RelativePath="..\xmlstring.c"
-			>
-		</File>
-		<File
-			RelativePath="..\xmlunicode.c"
-			>
-		</File>
-		<File
-			RelativePath="..\xmlwriter.c"
-			>
-		</File>
-		<File
-			RelativePath="..\xpath.c"
-			>
-		</File>
-		<File
-			RelativePath="..\xpointer.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/third_party/libxslt/build/libxslt.vcproj b/third_party/libxslt/build/libxslt.vcproj
deleted file mode 100644
index 3180b18..0000000
--- a/third_party/libxslt/build/libxslt.vcproj
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libxslt"
-	ProjectGUID="{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}"
-	RootNamespace="libxslt"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\libxslt.vsprops"
-			>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\libxslt.vsprops"
-			>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="libxslt"
-			>
-			<File
-				RelativePath="..\libxslt\attributes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\attributes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\attrvt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\documents.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\documents.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\extensions.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\extensions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\extra.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\extra.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\functions.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\functions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\imports.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\imports.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\keys.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\keys.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\libxslt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\namespaces.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\namespaces.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\numbers.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\numbersInternals.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\pattern.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\pattern.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\preproc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\preproc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\security.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\security.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\templates.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\templates.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\transform.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\transform.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\trio.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\triodef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\variables.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\variables.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\win32config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\xslt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\xslt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\xsltconfig.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\xsltexports.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\xsltInternals.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\xsltutils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\xsltutils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\libxslt\xsltwin32config.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/third_party/sqlite/sqlite.vcproj b/third_party/sqlite/sqlite.vcproj
deleted file mode 100644
index 421880c..0000000
--- a/third_party/sqlite/sqlite.vcproj
+++ /dev/null
@@ -1,542 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="sqlite"
-	ProjectGUID="{6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9}"
-	RootNamespace="sqlite"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;.\sqlite.vsprops;$(SolutionDir)..\build\external_code.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\third_party\sqlite\src&quot;;&quot;$(SolutionDir)..\third_party\sqlite\preprocessed&quot;"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;.\sqlite.vsprops;$(SolutionDir)..\build\external_code.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\third_party\sqlite\src&quot;;&quot;$(SolutionDir)..\third_party\sqlite\preprocessed&quot;"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Shell|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;.\sqlite.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\build\external_code.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\third_party\sqlite\src&quot;;&quot;$(SolutionDir)..\third_party\sqlite\preprocessed&quot;"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<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>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\src\alter.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\analyze.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\attach.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\auth.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\bitvec.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\btmutex.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\btree.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\btree.h"
-			>
-		</File>
-		<File
-			RelativePath=".\src\btreeInt.h"
-			>
-		</File>
-		<File
-			RelativePath=".\src\build.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\callback.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\complete.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\date.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\delete.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\expr.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\fault.c"
-			>
-		</File>
-		<File
-			RelativePath=".\ext\fts2\fts2.c"
-			>
-		</File>
-		<File
-			RelativePath=".\ext\fts2\fts2.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ext\fts2\fts2_hash.c"
-			>
-		</File>
-		<File
-			RelativePath=".\ext\fts2\fts2_hash.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ext\fts2\fts2_icu.c"
-			>
-		</File>
-		<File
-			RelativePath=".\ext\fts2\fts2_porter.c"
-			>
-		</File>
-		<File
-			RelativePath=".\ext\fts2\fts2_tokenizer.c"
-			>
-		</File>
-		<File
-			RelativePath=".\ext\fts2\fts2_tokenizer.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ext\fts2\fts2_tokenizer1.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\func.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\global.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\hash.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\hash.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ext\icu\icu.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\insert.c"
-			>
-		</File>
-		<File
-			RelativePath=".\preprocessed\keywordhash.h"
-			>
-		</File>
-		<File
-			RelativePath=".\src\legacy.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\loadext.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\main.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\malloc.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\mem1.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\mem2.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\mem3.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\mem4.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\mem5.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\mem6.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\mutex.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\mutex.h"
-			>
-		</File>
-		<File
-			RelativePath=".\src\mutex_w32.c"
-			>
-		</File>
-		<File
-			RelativePath=".\preprocessed\opcodes.c"
-			>
-		</File>
-		<File
-			RelativePath=".\preprocessed\opcodes.h"
-			>
-		</File>
-		<File
-			RelativePath=".\src\os.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\os.h"
-			>
-		</File>
-		<File
-			RelativePath=".\src\os_common.h"
-			>
-		</File>
-		<File
-			RelativePath=".\src\os_win.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\pager.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\pager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\preprocessed\parse.c"
-			>
-		</File>
-		<File
-			RelativePath=".\preprocessed\parse.h"
-			>
-		</File>
-		<File
-			RelativePath=".\src\pragma.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\prepare.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\printf.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\random.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\select.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\shell.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				ExcludedFromBuild="true"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\src\shell_icu_win.c"
-			>
-		</File>
-		<File
-			RelativePath=".\preprocessed\sqlite3.h"
-			>
-		</File>
-		<File
-			RelativePath=".\src\sqlite3ext.h"
-			>
-		</File>
-		<File
-			RelativePath=".\src\sqliteInt.h"
-			>
-		</File>
-		<File
-			RelativePath=".\src\sqliteLimit.h"
-			>
-		</File>
-		<File
-			RelativePath=".\src\status.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\table.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\tokenize.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\trigger.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\update.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\utf.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\util.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\vacuum.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\vdbe.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\vdbe.h"
-			>
-		</File>
-		<File
-			RelativePath=".\src\vdbeapi.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\vdbeaux.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\vdbeblob.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\vdbefifo.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\vdbeInt.h"
-			>
-		</File>
-		<File
-			RelativePath=".\src\vdbemem.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\vtab.c"
-			>
-		</File>
-		<File
-			RelativePath=".\src\where.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/webkit/webkit.sln b/webkit/webkit.sln
index 7e25d4f..a4e7b3d 100644
--- a/webkit/webkit.sln
+++ b/webkit/webkit.sln
@@ -139,9 +139,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell_tests", "tools\t
 		{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml", "..\third_party\libxml\build\libxml.vcproj", "{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml", "..\third_party\libxml\libxml.vcproj", "{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\third_party\libxslt\build\libxslt.vcproj", "{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxslt", "..\third_party\libxslt\libxslt.vcproj", "{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}"
 	ProjectSection(ProjectDependencies) = postProject
 		{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}
 	EndProjectSection