../ThirdParty: [WinCairo] Build WinCairo port under VS2010.
authorbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Mar 2013 00:49:16 +0000 (00:49 +0000)
committerbfulgham@webkit.org <bfulgham@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Mar 2013 00:49:16 +0000 (00:49 +0000)
https://bugs.webkit.org/show_bug.cgi?id=112861

Reviewed by Tim Horton.

* gtest/msvc/gtest-md.vcxproj: Add WinCairo targets.

../WebKit: [WinCairo] Top-level solution change to build under VS2010.
https://bugs.webkit.org/show_bug.cgi?id=112861.

Reviewed by Tim Horton.

* WebKit.vcxproj/WebKit.sln: Add final set of WinCairo build
targets.
* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
Add #if/def guards around some media-specific exports that
are not provided by the WinCairo port.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@146422 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/ChangeLog
Source/ThirdParty/gtest/msvc/gtest-md.vcxproj
Source/WebKit/ChangeLog
Source/WebKit/WebKit.vcxproj/WebKit.sln
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in

index 2834bfb..77be860 100644 (file)
@@ -1,3 +1,12 @@
+2013-03-20  Brent Fulgham  <bfulgham@webkit.org>
+
+        [WinCairo] Build WinCairo port under VS2010.
+        https://bugs.webkit.org/show_bug.cgi?id=112861
+
+        Reviewed by Tim Horton.
+
+        * gtest/msvc/gtest-md.vcxproj: Add WinCairo targets.
+
 2013-03-07  Andrew Bortz  <andrew@abortz.net>
 
         Replace Mersenne Twister RNG with a simple but fast RNG
index 6461379..ec1fda2 100644 (file)
@@ -5,6 +5,10 @@
       <Configuration>DebugSuffix</Configuration>\r
       <Platform>Win32</Platform>\r
     </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug_WinCairo|Win32">\r
+      <Configuration>Debug_WinCairo</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
     <ProjectConfiguration Include="Debug|Win32">\r
       <Configuration>Debug</Configuration>\r
       <Platform>Win32</Platform>\r
       <Configuration>Production</Configuration>\r
       <Platform>Win32</Platform>\r
     </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release_WinCairo|Win32">\r
+      <Configuration>Release_WinCairo</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
     <ProjectConfiguration Include="Release|Win32">\r
       <Configuration>Release</Configuration>\r
       <Platform>Win32</Platform>\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <CharacterSet>MultiByte</CharacterSet>\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <CharacterSet>MultiByte</CharacterSet>\r
   </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">\r
+    <ConfigurationType>StaticLibrary</ConfigurationType>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">\r
     <ConfigurationType>StaticLibrary</ConfigurationType>\r
     <CharacterSet>MultiByte</CharacterSet>\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+  </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
   </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+    <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
+  </ImportGroup>\r
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
     <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ConfigurationBuildDir)\lib\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">$(ConfigurationBuildDir)\lib\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">$(ConfigurationBuildDir)\lib\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ConfigurationBuildDir)\lib\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">$(ConfigurationBuildDir)\lib\</OutDir>\r
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">$(ConfigurationBuildDir)\lib\</OutDir>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gtest</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">gtest</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">gtest</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gtest</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">gtest</TargetName>\r
     <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">gtest</TargetName>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
       <OutputFile>$(OutDir)gtest.lib</OutputFile>\r
     </Lib>\r
   </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+    </ClCompile>\r
+    <Lib>\r
+      <OutputFile>$(OutDir)gtest.lib</OutputFile>\r
+    </Lib>\r
+  </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
     </ClCompile>\r
     <Lib />\r
   </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">\r
+    <ClCompile>\r
+      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ClCompile>\r
+    <Lib />\r
+  </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">\r
     <ClCompile>\r
       <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\JavaScriptCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
index 4ea38db..6dd249b 100644 (file)
@@ -1,3 +1,16 @@
+2013-03-20  Brent Fulgham  <bfulgham@webkit.org>
+
+        [WinCairo] Top-level solution change to build under VS2010.
+        https://bugs.webkit.org/show_bug.cgi?id=112861.
+
+        Reviewed by Tim Horton.
+
+        * WebKit.vcxproj/WebKit.sln: Add final set of WinCairo build
+        targets.
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
+        Add #if/def guards around some media-specific exports that
+        are not provided by the WinCairo port.
+
 2013-03-19  Brent Fulgham  <bfulgham@webkit.org>
 
         [WinCairo] Build the WebKit.dll under VS2010.
index f760aab..b4076a1 100644 (file)
@@ -349,24 +349,24 @@ Global
                {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
                {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Release|Win32.ActiveCfg = Release|Win32
                {BB7E61B8-869E-45E7-8F12-0907D08C1F57}.Release|Win32.Build.0 = Release|Win32
-               {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_WinCairo|Win32.ActiveCfg = Debug|Win32
-               {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_WinCairo|Win32.Build.0 = Debug|Win32
+               {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
                {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug|Win32.ActiveCfg = Debug|Win32
                {114FCA11-216B-4C8C-957E-30A75AE80443}.Debug|Win32.Build.0 = Debug|Win32
                {114FCA11-216B-4C8C-957E-30A75AE80443}.Production|Win32.ActiveCfg = Production|Win32
                {114FCA11-216B-4C8C-957E-30A75AE80443}.Production|Win32.Build.0 = Production|Win32
-               {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_WinCairo|Win32.ActiveCfg = Release|Win32
-               {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_WinCairo|Win32.Build.0 = Release|Win32
+               {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {114FCA11-216B-4C8C-957E-30A75AE80443}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
                {114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.ActiveCfg = Release|Win32
                {114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.Build.0 = Release|Win32
-               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_WinCairo|Win32.ActiveCfg = Debug|Win32
-               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_WinCairo|Win32.Build.0 = Debug|Win32
+               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug|Win32.ActiveCfg = Debug|Win32
                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Debug|Win32.Build.0 = Debug|Win32
                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Production|Win32.ActiveCfg = Production|Win32
                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Production|Win32.Build.0 = Production|Win32
-               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release_WinCairo|Win32.ActiveCfg = Release|Win32
-               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release_WinCairo|Win32.Build.0 = Release|Win32
+               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release|Win32.ActiveCfg = Release|Win32
                {767B10FB-76C1-44D0-8005-85ED7F9AA5E4}.Release|Win32.Build.0 = Release|Win32
                {83414B15-1C0D-490B-990E-03F4D49170E4}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
@@ -379,84 +379,84 @@ Global
                {83414B15-1C0D-490B-990E-03F4D49170E4}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
                {83414B15-1C0D-490B-990E-03F4D49170E4}.Release|Win32.ActiveCfg = Release|Win32
                {83414B15-1C0D-490B-990E-03F4D49170E4}.Release|Win32.Build.0 = Release|Win32
-               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_WinCairo|Win32.ActiveCfg = Debug|Win32
-               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_WinCairo|Win32.Build.0 = Debug|Win32
+               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug|Win32.ActiveCfg = Debug|Win32
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug|Win32.Build.0 = Debug|Win32
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Production|Win32.ActiveCfg = Production|Win32
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Production|Win32.Build.0 = Production|Win32
-               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_WinCairo|Win32.ActiveCfg = Release|Win32
-               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_WinCairo|Win32.Build.0 = Release|Win32
+               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.ActiveCfg = Release|Win32
                {C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.Build.0 = Release|Win32
-               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_WinCairo|Win32.ActiveCfg = Debug|Win32
-               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_WinCairo|Win32.Build.0 = Debug|Win32
+               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug|Win32.ActiveCfg = Debug|Win32
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug|Win32.Build.0 = Debug|Win32
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Production|Win32.ActiveCfg = Production|Win32
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Production|Win32.Build.0 = Production|Win32
-               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_WinCairo|Win32.ActiveCfg = Release|Win32
-               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_WinCairo|Win32.Build.0 = Release|Win32
+               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.ActiveCfg = Release|Win32
                {59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.Build.0 = Release|Win32
-               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_WinCairo|Win32.ActiveCfg = Debug|Win32
-               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_WinCairo|Win32.Build.0 = Debug|Win32
+               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
                {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug|Win32.ActiveCfg = Debug|Win32
                {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Debug|Win32.Build.0 = Debug|Win32
                {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Production|Win32.ActiveCfg = Production|Win32
                {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Production|Win32.Build.0 = Production|Win32
-               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release_WinCairo|Win32.ActiveCfg = Release|Win32
-               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release_WinCairo|Win32.Build.0 = Release|Win32
+               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
                {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release|Win32.ActiveCfg = Release|Win32
                {DD7949B6-F2B4-47C2-9C42-E21E84CB1017}.Release|Win32.Build.0 = Release|Win32
-               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_WinCairo|Win32.ActiveCfg = Debug|Win32
-               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_WinCairo|Win32.Build.0 = Debug|Win32
+               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug|Win32.ActiveCfg = Debug|Win32
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug|Win32.Build.0 = Debug|Win32
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Production|Win32.ActiveCfg = Production|Win32
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Production|Win32.Build.0 = Production|Win32
-               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_WinCairo|Win32.ActiveCfg = Release|Win32
-               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_WinCairo|Win32.Build.0 = Release|Win32
+               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release|Win32.ActiveCfg = Release|Win32
                {6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release|Win32.Build.0 = Release|Win32
-               {2974EA02-840B-4995-8719-8920A61006F1}.Debug_WinCairo|Win32.ActiveCfg = Debug|Win32
-               {2974EA02-840B-4995-8719-8920A61006F1}.Debug_WinCairo|Win32.Build.0 = Debug|Win32
+               {2974EA02-840B-4995-8719-8920A61006F1}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {2974EA02-840B-4995-8719-8920A61006F1}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
                {2974EA02-840B-4995-8719-8920A61006F1}.Debug|Win32.ActiveCfg = Debug|Win32
                {2974EA02-840B-4995-8719-8920A61006F1}.Debug|Win32.Build.0 = Debug|Win32
                {2974EA02-840B-4995-8719-8920A61006F1}.Production|Win32.ActiveCfg = Production|Win32
                {2974EA02-840B-4995-8719-8920A61006F1}.Production|Win32.Build.0 = Production|Win32
-               {2974EA02-840B-4995-8719-8920A61006F1}.Release_WinCairo|Win32.ActiveCfg = Release|Win32
-               {2974EA02-840B-4995-8719-8920A61006F1}.Release_WinCairo|Win32.Build.0 = Release|Win32
+               {2974EA02-840B-4995-8719-8920A61006F1}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {2974EA02-840B-4995-8719-8920A61006F1}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
                {2974EA02-840B-4995-8719-8920A61006F1}.Release|Win32.ActiveCfg = Release|Win32
                {2974EA02-840B-4995-8719-8920A61006F1}.Release|Win32.Build.0 = Release|Win32
-               {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug_WinCairo|Win32.ActiveCfg = Debug|Win32
-               {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug_WinCairo|Win32.Build.0 = Debug|Win32
+               {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
                {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|Win32.ActiveCfg = Debug|Win32
                {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Debug|Win32.Build.0 = Debug|Win32
                {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Production|Win32.ActiveCfg = Production|Win32
                {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Production|Win32.Build.0 = Production|Win32
-               {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release_WinCairo|Win32.ActiveCfg = Release|Win32
-               {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release_WinCairo|Win32.Build.0 = Release|Win32
+               {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
                {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|Win32.ActiveCfg = Release|Win32
                {C8F6C172-56F2-4E76-B5FA-C3B423B31BE8}.Release|Win32.Build.0 = Release|Win32
-               {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Debug_WinCairo|Win32.ActiveCfg = Debug|Win32
-               {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Debug_WinCairo|Win32.Build.0 = Debug|Win32
+               {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
                {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Debug|Win32.ActiveCfg = Debug|Win32
                {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Debug|Win32.Build.0 = Debug|Win32
                {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Production|Win32.ActiveCfg = Production|Win32
                {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Production|Win32.Build.0 = Production|Win32
-               {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Release_WinCairo|Win32.ActiveCfg = Release|Win32
-               {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Release_WinCairo|Win32.Build.0 = Release|Win32
+               {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
                {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Release|Win32.ActiveCfg = Release|Win32
                {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}.Release|Win32.Build.0 = Release|Win32
-               {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Debug_WinCairo|Win32.ActiveCfg = Debug|Win32
-               {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Debug_WinCairo|Win32.Build.0 = Debug|Win32
+               {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+               {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
                {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Debug|Win32.ActiveCfg = Debug|Win32
                {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Debug|Win32.Build.0 = Debug|Win32
                {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Production|Win32.ActiveCfg = Production|Win32
                {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Production|Win32.Build.0 = Production|Win32
-               {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Release_WinCairo|Win32.ActiveCfg = Release|Win32
-               {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Release_WinCairo|Win32.Build.0 = Release|Win32
+               {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+               {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
                {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Release|Win32.ActiveCfg = Release|Win32
                {F93EBE5A-20F3-44C1-B192-C4AA2BA95FD5}.Release|Win32.Build.0 = Release|Win32
        EndGlobalSection
index 00ce93e..ca6a04d 100644 (file)
@@ -416,7 +416,9 @@ EXPORTS
         ?setAuthorAndUserStylesEnabled@Settings@WebCore@@QAEX_N@Z
         ?setAcceleratedCompositingEnabled@Settings@WebCore@@QAEX_N@Z
         ?setAutofilled@HTMLInputElement@WebCore@@QAEX_N@Z
+#if ENABLE(VIDEO_TRACK)
         ?captionPreferences@PageGroup@WebCore@@QAEPAVCaptionUserPreferences@2@XZ
+#endif
         ?initGroup@Page@WebCore@@AAEXXZ
 
 #if ENABLE(WORKERS)