Title: [151536] trunk/WebKitLibraries
- Revision
- 151536
- Author
- [email protected]
- Date
- 2013-06-12 22:58:53 -0700 (Wed, 12 Jun 2013)
Log Message
[WinCairo] Unreviewed build correction.
* win/tools32/vsprops/WinCairo.props: Switch from using the
$WebKitLibraries environment variable to the newer
$WebKit_Libraries.
* win/tools32/vsprops/debug_wincairo.props: Ditto.
Modified Paths
Diff
Modified: trunk/WebKitLibraries/ChangeLog (151535 => 151536)
--- trunk/WebKitLibraries/ChangeLog 2013-06-13 01:48:44 UTC (rev 151535)
+++ trunk/WebKitLibraries/ChangeLog 2013-06-13 05:58:53 UTC (rev 151536)
@@ -1,3 +1,12 @@
+2013-06-12 Brent Fulgham <[email protected]>
+
+ [WinCairo] Unreviewed build correction.
+
+ * win/tools32/vsprops/WinCairo.props: Switch from using the
+ $WebKitLibraries environment variable to the newer
+ $WebKit_Libraries.
+ * win/tools32/vsprops/debug_wincairo.props: Ditto.
+
2013-06-11 Roger Fong <[email protected]>
Unreviewed. Another part of rollout of r151408.
Modified: trunk/WebKitLibraries/win/tools32/vsprops/WinCairo.props (151535 => 151536)
--- trunk/WebKitLibraries/win/tools32/vsprops/WinCairo.props 2013-06-13 01:48:44 UTC (rev 151535)
+++ trunk/WebKitLibraries/win/tools32/vsprops/WinCairo.props 2013-06-13 05:58:53 UTC (rev 151536)
@@ -5,12 +5,12 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>$(WebKitLibrariesDir)\include\cairo;$(SolutionDir)\..\..\_javascript_Core\os-win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(WebKit_Libraries)\include\cairo;$(SolutionDir)\..\..\_javascript_Core\os-win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN_CAIRO=1;WTF_PLATFORM_WIN_CAIRO=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>cairo.lib;libjpeg.lib;zdll.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(WebKitLibrariesDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(WebKit_Libraries)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: trunk/WebKitLibraries/win/tools32/vsprops/debug_wincairo.props (151535 => 151536)
--- trunk/WebKitLibraries/win/tools32/vsprops/debug_wincairo.props 2013-06-13 01:48:44 UTC (rev 151535)
+++ trunk/WebKitLibraries/win/tools32/vsprops/debug_wincairo.props 2013-06-13 05:58:53 UTC (rev 151536)
@@ -12,14 +12,14 @@
<ItemDefinitionGroup>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(WebKitLibrariesDir)\include\cairo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(WebKit_Libraries)\include\cairo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>DEBUG_ALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
- <AdditionalLibraryDirectories>$(WebKitLibrariesDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(WebKit_Libraries)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -35,4 +35,4 @@
<Value>$(WebKitDLLConfigSuffix)</Value>
</BuildMacro>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
