[WinCairo] Unreviewed build correction.
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Jun 2013 05:58:53 +0000 (05:58 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Jun 2013 05:58:53 +0000 (05:58 +0000)
* win/tools32/vsprops/WinCairo.props: Switch from using the
  $WebKitLibraries environment variable to the newer
  $WebKit_Libraries.
* win/tools32/vsprops/debug_wincairo.props: Ditto.

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

WebKitLibraries/ChangeLog
WebKitLibraries/win/tools32/vsprops/WinCairo.props
WebKitLibraries/win/tools32/vsprops/debug_wincairo.props

index 6c3f50f..5169b27 100644 (file)
@@ -1,3 +1,12 @@
+2013-06-12  Brent Fulgham  <bfulgham@webkit.org>
+
+        [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  <roger_fong@apple.com>
 
         Unreviewed. Another part of rollout of r151408.
index 4722daf..d12d68c 100644 (file)
@@ -5,12 +5,12 @@
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>$(WebKitLibrariesDir)\include\cairo;$(SolutionDir)\..\..\JavaScriptCore\os-win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(WebKit_Libraries)\include\cairo;$(SolutionDir)\..\..\JavaScriptCore\os-win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN_CAIRO=1;WTF_PLATFORM_WIN_CAIRO=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>cairo.lib;libjpeg.lib;zdll.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>$(WebKitLibrariesDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>$(WebKit_Libraries)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
     </Link>\r
   </ItemDefinitionGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r
index 0d3ba01..c7f3d8f 100644 (file)
   <ItemDefinitionGroup>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>$(WebKitLibrariesDir)\include\cairo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>$(WebKit_Libraries)\include\cairo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>DEBUG_ALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalLibraryDirectories>$(WebKitLibrariesDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>$(WebKit_Libraries)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
@@ -35,4 +35,4 @@
       <Value>$(WebKitDLLConfigSuffix)</Value>\r
     </BuildMacro>\r
   </ItemGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r