Title: [146422] trunk/Source
- Revision
- 146422
- Author
- bfulg...@webkit.org
- Date
- 2013-03-20 17:49:16 -0700 (Wed, 20 Mar 2013)
Log Message
../ThirdParty: [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.
../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.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ChangeLog (146421 => 146422)
--- trunk/Source/ThirdParty/ChangeLog 2013-03-21 00:43:54 UTC (rev 146421)
+++ trunk/Source/ThirdParty/ChangeLog 2013-03-21 00:49:16 UTC (rev 146422)
@@ -1,3 +1,12 @@
+2013-03-20 Brent Fulgham <bfulg...@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 <and...@abortz.net>
Replace Mersenne Twister RNG with a simple but fast RNG
Modified: trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj (146421 => 146422)
--- trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj 2013-03-21 00:43:54 UTC (rev 146421)
+++ trunk/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj 2013-03-21 00:49:16 UTC (rev 146422)
@@ -5,6 +5,10 @@
<Configuration>DebugSuffix</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug_WinCairo|Win32">
+ <Configuration>Debug_WinCairo</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
@@ -13,6 +17,10 @@
<Configuration>Production</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release_WinCairo|Win32">
+ <Configuration>Release_WinCairo</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -28,6 +36,10 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
@@ -36,6 +48,10 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
@@ -47,6 +63,10 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />
@@ -55,6 +75,10 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />
@@ -64,12 +88,16 @@
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ConfigurationBuildDir)\lib\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">$(ConfigurationBuildDir)\lib\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">$(ConfigurationBuildDir)\lib\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ConfigurationBuildDir)\lib\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">$(ConfigurationBuildDir)\lib\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">$(ConfigurationBuildDir)\lib\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gtest</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">gtest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">gtest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gtest</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">gtest</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">gtest</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -86,6 +114,20 @@
<OutputFile>$(OutDir)gtest.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\_javascript_Core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ </ClCompile>
+ <Lib>
+ <OutputFile>$(OutDir)gtest.lib</OutputFile>
+ </Lib>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
@@ -109,6 +151,15 @@
</ClCompile>
<Lib />
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\_javascript_Core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Lib />
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Include;$(ConfigurationBuildDir)\include\WebCore\ForwardingHeaders;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\private\_javascript_Core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
Modified: trunk/Source/WebKit/ChangeLog (146421 => 146422)
--- trunk/Source/WebKit/ChangeLog 2013-03-21 00:43:54 UTC (rev 146421)
+++ trunk/Source/WebKit/ChangeLog 2013-03-21 00:49:16 UTC (rev 146422)
@@ -1,3 +1,16 @@
+2013-03-20 Brent Fulgham <bfulg...@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 <bfulg...@webkit.org>
[WinCairo] Build the WebKit.dll under VS2010.
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln (146421 => 146422)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2013-03-21 00:43:54 UTC (rev 146421)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln 2013-03-21 00:49:16 UTC (rev 146422)
@@ -349,24 +349,24 @@
{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 @@
{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
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (146421 => 146422)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2013-03-21 00:43:54 UTC (rev 146421)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2013-03-21 00:49:16 UTC (rev 146422)
@@ -416,7 +416,9 @@
?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)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
