Title: [146144] trunk/Source/_javascript_Core
- Revision
- 146144
- Author
- bfulg...@webkit.org
- Date
- 2013-03-18 16:10:08 -0700 (Mon, 18 Mar 2013)
Log Message
[WinCairo] Get build working under VS2010.
https://bugs.webkit.org/show_bug.cgi?id=112604
Reviewed by Tim Horton.
* _javascript_Core.vcxproj/testapi/testapi.vcxproj: Use CFLite-specific
build target (standard version links against CoreFoundation.lib
instead of CFLite.lib).
* _javascript_Core.vcxproj/testapi/testapiCommonCFLite.props: Added.
* _javascript_Core.vcxproj/testapi/testapiDebugCFLite.props: Added.
* _javascript_Core.vcxproj/testapi/testapiReleaseCFLite.props: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (146143 => 146144)
--- trunk/Source/_javascript_Core/ChangeLog 2013-03-18 23:08:32 UTC (rev 146143)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-03-18 23:10:08 UTC (rev 146144)
@@ -1,3 +1,17 @@
+2013-03-18 Brent Fulgham <bfulg...@webkit.org>
+
+ [WinCairo] Get build working under VS2010.
+ https://bugs.webkit.org/show_bug.cgi?id=112604
+
+ Reviewed by Tim Horton.
+
+ * _javascript_Core.vcxproj/testapi/testapi.vcxproj: Use CFLite-specific
+ build target (standard version links against CoreFoundation.lib
+ instead of CFLite.lib).
+ * _javascript_Core.vcxproj/testapi/testapiCommonCFLite.props: Added.
+ * _javascript_Core.vcxproj/testapi/testapiDebugCFLite.props: Added.
+ * _javascript_Core.vcxproj/testapi/testapiReleaseCFLite.props: Added.
+
2013-03-18 Roger Fong <roger_f...@apple.com>
AppleWin VS2010 Debug configuration build fix..
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapi.vcxproj (146143 => 146144)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapi.vcxproj 2013-03-18 23:08:32 UTC (rev 146143)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapi.vcxproj 2013-03-18 23:10:08 UTC (rev 146144)
@@ -71,7 +71,7 @@
</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="testapiDebug.props" />
+ <Import Project="testapiDebugCFLite.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" />
@@ -84,7 +84,7 @@
</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="testapiRelease.props" />
+ <Import Project="testapiReleaseCFLite.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" />
@@ -154,4 +154,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Added: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiCommonCFLite.props (0 => 146144)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiCommonCFLite.props (rev 0)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiCommonCFLite.props 2013-03-18 23:10:08 UTC (rev 146144)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets" />
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup>
+ <Link>
+ <AdditionalDependencies>CFLite.lib;_javascript_Core$(DebugSuffix).lib;WTF$(DebugSuffix).lib;pthreadVC2.lib;libicuin.lib;libicuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ <ClCompile>
+ <PreprocessorDefinitions>NOMINMAX;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\..\API;$(ConfigurationBuildDir)\include\_javascript_Core;$(ConfigurationBuildDir)\include\private\_javascript_Core;$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup />
+</Project>
Added: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiDebugCFLite.props (0 => 146144)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiDebugCFLite.props (rev 0)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiDebugCFLite.props 2013-03-18 23:10:08 UTC (rev 146144)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\debug.props" />
+ <Import Project="testapiCommonCFLite.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_PropertySheetDisplayName>testapiDebug</_PropertySheetDisplayName>
+ </PropertyGroup>
+ <ItemDefinitionGroup />
+ <ItemGroup />
+</Project>
Added: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiReleaseCFLite.props (0 => 146144)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiReleaseCFLite.props (rev 0)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiReleaseCFLite.props 2013-03-18 23:10:08 UTC (rev 146144)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\common.props" />
+ <Import Project="$(WebKit_Source)\WebKit\WebKit.vcxproj\release.props" />
+ <Import Project="testapiCommonCFLite.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup />
+ <ItemDefinitionGroup />
+ <ItemGroup />
+</Project>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
