Title: [153012] branches/safari-537-branch
- Revision
- 153012
- Author
- [email protected]
- Date
- 2013-07-22 16:53:57 -0700 (Mon, 22 Jul 2013)
Log Message
Merged r152874. <rdar://problem/14473010>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/ThirdParty/ChangeLog (153011 => 153012)
--- branches/safari-537-branch/Source/ThirdParty/ChangeLog 2013-07-22 23:43:31 UTC (rev 153011)
+++ branches/safari-537-branch/Source/ThirdParty/ChangeLog 2013-07-22 23:53:57 UTC (rev 153012)
@@ -1,3 +1,14 @@
+2013-07-22 Lucas Forschler <[email protected]>
+
+ Merge r152874
+
+ 2013-07-18 Roger Fong <[email protected]>
+
+ Make sure to link against _debug binaries when appropriate.
+ <rdar://problem/14473010>.
+
+ * gtest/msvc/gtest-md.vcxproj:
+
2013-06-18 Roger Fong <[email protected]>
Replace tools32 folder with tools and update WebKit Windows solution accordingly.
Modified: branches/safari-537-branch/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj (153011 => 153012)
--- branches/safari-537-branch/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj 2013-07-22 23:43:31 UTC (rev 153011)
+++ branches/safari-537-branch/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj 2013-07-22 23:53:57 UTC (rev 153012)
@@ -133,7 +133,6 @@
<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>
Modified: branches/safari-537-branch/WebKitLibraries/ChangeLog (153011 => 153012)
--- branches/safari-537-branch/WebKitLibraries/ChangeLog 2013-07-22 23:43:31 UTC (rev 153011)
+++ branches/safari-537-branch/WebKitLibraries/ChangeLog 2013-07-22 23:53:57 UTC (rev 153012)
@@ -1,3 +1,14 @@
+2013-07-22 Lucas Forschler <[email protected]>
+
+ Merge r152874
+
+ 2013-07-18 Roger Fong <[email protected]>
+
+ Make sure to link against _debug binaries when appropriate.
+ <rdar://problem/14473010>.
+
+ * win/tools/vsprops/debugsuffix.props:
+
2013-06-18 Roger Fong <[email protected]>
Replace tools32 folder with tools and update WebKit Windows solution accordingly.
Modified: branches/safari-537-branch/WebKitLibraries/win/tools/vsprops/debugsuffix.props (153011 => 153012)
--- branches/safari-537-branch/WebKitLibraries/win/tools/vsprops/debugsuffix.props 2013-07-22 23:43:31 UTC (rev 153011)
+++ branches/safari-537-branch/WebKitLibraries/win/tools/vsprops/debugsuffix.props 2013-07-22 23:53:57 UTC (rev 153012)
@@ -9,7 +9,8 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <UndefinePreprocessorDefinitions>DEBUG_INTERNAL;DEBUG_ALL;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
+ <PreprocessorDefinitions>_CONSOLE;DEBUG_INTERNAL;DEBUG_ALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)\$(ProjectName)$(DebugSuffix).lib</OutputFile>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes