Merge WebKit at r73109: Initial merge by git.

[android-x86/external-webkit.git] / WebCore / WebCore.vcproj / WebCoreGenerated.vcproj

diff --git a/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj b/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj
index a7e8f6f..115189d 100644 (file)
--- a/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj
+++ b/WebCore/WebCore.vcproj/WebCoreGenerated.vcproj
@@ -15,23 +15,57 @@
        </ToolFiles>
        <Configurations>
                <Configuration
+                       Name="Debug_All|Win32"
+                       ConfigurationType="0"
+                       InheritedPropertySheets=".\WebCoreGeneratedCommon.vsprops"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug_Cairo_CFLite|Win32"
+                       ConfigurationType="0"
+                       InheritedPropertySheets=".\WebCoreGeneratedCommon.vsprops;.\WebCoreGeneratedCairo.vsprops"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|Win32"
+                       ConfigurationType="0"
+                       InheritedPropertySheets=".\WebCoreGeneratedCommon.vsprops"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                       />
+               </Configuration>
+               <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(WebKitOutputDir)\lib"
-                       IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"
                        ConfigurationType="0"
+                       InheritedPropertySheets=".\WebCoreGeneratedCommon.vsprops"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release_LTCG|Win32"
+                       ConfigurationType="0"
+                       InheritedPropertySheets=".\WebCoreGeneratedCommon.vsprops"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release_Cairo_CFLite|Win32"
+                       ConfigurationType="0"
+                       InheritedPropertySheets=".\WebCoreGeneratedCommon.vsprops;.\WebCoreGeneratedCairo.vsprops"
                        >
                        <Tool
                                Name="VCNMakeTool"
-                               BuildCommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot;&#x0D;&#x0A;bash migrate-idls.sh &quot;$(WebKitOutputDir)/obj/WebKit/DOMInterfaces&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"
-                               ReBuildCommandLine="echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\WebKit\DOMInterfaces&quot;&#x0D;&#x0A;set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;bash build-generated-files.sh &quot;$(WebKitOutputDir)&quot; &quot;$(WebKitLibrariesDir)&quot;&#x0D;&#x0A;bash migrate-idls.sh &quot;$(WebKitOutputDir)/obj/WebKit/DOMInterfaces&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"
-                               CleanCommandLine="del /s /q &quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;&#x0D;&#x0A;del /s /q &quot;$(WebKitOutputDir)\obj\WebKit\DOMInterfaces&quot;&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"
-                               Output=""
-                               PreprocessorDefinitions=""
-                               IncludeSearchPath=""
-                               ForcedIncludes=""
-                               AssemblySearchPath=""
-                               ForcedUsingAssemblies=""
-                               CompileAsManaged=""
                        />
                </Configuration>
        </Configurations>
@@ -42,6 +76,18 @@
                        RelativePath=".\build-generated-files.sh"
                        >
                </File>
+               <File
+                       RelativePath=".\copyForwardingHeaders.cmd"
+                       >
+               </File>
+               <File
+                       RelativePath=".\copyInspectorFiles.cmd"
+                       >
+               </File>
+               <File
+                       RelativePath=".\migrate-scripts.sh"
+                       >
+               </File>
        </Files>
        <Globals>
        </Globals>