<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173616] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173616">173616</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-15 02:45:01 -0700 (Mon, 15 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WinCairo] Make it easier to enable/disable GStreamer.
https://bugs.webkit.org/show_bug.cgi?id=135766
Patch by peavo@outlook.com <peavo@outlook.com> on 2014-09-15
Reviewed by Brent Fulgham.
Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
Source/WebCore:
* WebCore.vcxproj/WebCoreDebugWinCairo.props: Import GStreamer property file.
* WebCore.vcxproj/WebCoreReleaseWinCairo.props: Ditto.
Source/WebKit:
* WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props: Import GStreamer property file.
* WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props: Ditto.
Source/WTF:
* WTF.vcxproj/WTFDebugWinCairo.props: Import GStreamer property file.
* WTF.vcxproj/WTFReleaseWinCairo.props: Ditto.
* wtf/Platform.h: Enable GStreamer if ENABLE(GSTREAMER_WINCAIRO) is true, otherwise use Media Foundation.
Tools:
* WinLauncher/WinMain.cpp: Compile fix when GStreamer is enabled.
WebKitLibraries:
* win/tools/vsprops/GStreamerCommon.props: Add user macro ENABLE_GSTREAMER_WINCAIRO.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFDebugWinCairoprops">trunk/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFReleaseWinCairoprops">trunk/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCoreDebugWinCairoprops">trunk/Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCoreReleaseWinCairoprops">trunk/Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitDebugWinCairoprops">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitReleaseWinCairoprops">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWinLauncherWinMaincpp">trunk/Tools/WinLauncher/WinMain.cpp</a></li>
<li><a href="#trunkWebKitLibrariesChangeLog">trunk/WebKitLibraries/ChangeLog</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsvspropsGStreamerCommonprops">trunk/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (173615 => 173616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WTF/ChangeLog 2014-09-15 09:45:01 UTC (rev 173616)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-09-15 peavo@outlook.com <peavo@outlook.com>
+
+ [WinCairo] Make it easier to enable/disable GStreamer.
+ https://bugs.webkit.org/show_bug.cgi?id=135766
+
+ Reviewed by Brent Fulgham.
+
+ Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
+
+ * WTF.vcxproj/WTFDebugWinCairo.props: Import GStreamer property file.
+ * WTF.vcxproj/WTFReleaseWinCairo.props: Ditto.
+ * wtf/Platform.h: Enable GStreamer if ENABLE(GSTREAMER_WINCAIRO) is true, otherwise use Media Foundation.
+
</ins><span class="cx"> 2014-09-10 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> Re-add the request autocomplete feature
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFDebugWinCairoprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props (173615 => 173616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props 2014-09-15 09:45:01 UTC (rev 173616)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> <Import Project="WTFCommon.props" />
</span><span class="cx"> <Import Project="WTFCFLite.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
</span><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <PropertyGroup />
</span><span class="cx"> <PropertyGroup />
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFReleaseWinCairoprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props (173615 => 173616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props 2014-09-15 09:45:01 UTC (rev 173616)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> <Import Project="WTFCommon.props" />
</span><span class="cx"> <Import Project="WTFCFLite.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
</span><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <PropertyGroup />
</span><span class="cx"> <ItemDefinitionGroup>
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (173615 => 173616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WTF/wtf/Platform.h 2014-09-15 09:45:01 UTC (rev 173616)
</span><span class="lines">@@ -872,8 +872,14 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO) && PLATFORM(WIN_CAIRO)
</span><ins>+#if ENABLE(GSTREAMER_WINCAIRO)
+#define WTF_USE_MEDIA_FOUNDATION 0
+#define WTF_USE_GLIB 1
+#define WTF_USE_GSTREAMER 1
+#else
</ins><span class="cx"> #define WTF_USE_MEDIA_FOUNDATION 1
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN_CAIRO)
</span><span class="cx"> #define WTF_USE_TEXTURE_MAPPER 1
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173615 => 173616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WebCore/ChangeLog 2014-09-15 09:45:01 UTC (rev 173616)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-09-15 peavo@outlook.com <peavo@outlook.com>
+
+ [WinCairo] Make it easier to enable/disable GStreamer.
+ https://bugs.webkit.org/show_bug.cgi?id=135766
+
+ Reviewed by Brent Fulgham.
+
+ Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
+
+ * WebCore.vcxproj/WebCoreDebugWinCairo.props: Import GStreamer property file.
+ * WebCore.vcxproj/WebCoreReleaseWinCairo.props: Ditto.
+
</ins><span class="cx"> 2014-09-12 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Crash at CSSParser::parseGridTemplateRowsAndAreas
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCoreDebugWinCairoprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props (173615 => 173616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props 2014-09-15 09:45:01 UTC (rev 173616)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\debug_wincairo.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
</span><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> <Import Project="WebCoreCommon.props" />
</span><span class="cx"> <Import Project="WebCoreCairo.props" />
</span><span class="cx"> <Import Project="WebCoreCURL.props" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCoreReleaseWinCairoprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props (173615 => 173616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props 2014-09-15 09:45:01 UTC (rev 173616)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
</span><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> <Import Project="WebCoreCommon.props" />
</span><span class="cx"> <Import Project="WebCoreCairo.props" />
</span><span class="cx"> <Import Project="WebCoreCURL.props" />
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (173615 => 173616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WebKit/ChangeLog 2014-09-15 09:45:01 UTC (rev 173616)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-09-15 peavo@outlook.com <peavo@outlook.com>
+
+ [WinCairo] Make it easier to enable/disable GStreamer.
+ https://bugs.webkit.org/show_bug.cgi?id=135766
+
+ Reviewed by Brent Fulgham.
+
+ Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
+
+ * WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props: Import GStreamer property file.
+ * WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props: Ditto.
+
</ins><span class="cx"> 2014-09-06 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Make updates suggested by new version of Xcode
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitDebugWinCairoprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props (173615 => 173616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props 2014-09-15 09:45:01 UTC (rev 173616)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\cURL.props" />
</span><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> <Import Project="WebKitCommon.props" />
</span><span class="cx"> <Import Project="WebKitDirectX.props" />
</span><span class="cx"> <Import Project="WebKitCFLite.props" />
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitReleaseWinCairoprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props (173615 => 173616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props 2014-09-15 09:45:01 UTC (rev 173616)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
</span><span class="cx"> <Import Project="$(WebKit_Libraries)\tools\vsprops\cURL.props" />
</span><ins>+ <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> <Import Project="WebKitCFLite.props" />
</span><span class="cx"> <Import Project="WebKitCommon.props" />
</span><span class="cx"> <Import Project="WebKitDirectX.props" />
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173615 => 173616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Tools/ChangeLog 2014-09-15 09:45:01 UTC (rev 173616)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-09-15 peavo@outlook.com <peavo@outlook.com>
+
+ [WinCairo] Make it easier to enable/disable GStreamer.
+ https://bugs.webkit.org/show_bug.cgi?id=135766
+
+ Reviewed by Brent Fulgham.
+
+ Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
+
+ * WinLauncher/WinMain.cpp: Compile fix when GStreamer is enabled.
+
</ins><span class="cx"> 2014-09-12 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: remind about rebaselining generator test results
</span></span></pre></div>
<a id="trunkToolsWinLauncherWinMaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/WinMain.cpp (173615 => 173616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WinLauncher/WinMain.cpp 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Tools/WinLauncher/WinMain.cpp 2014-09-15 09:45:01 UTC (rev 173616)
</span><span class="lines">@@ -31,6 +31,10 @@
</span><span class="cx"> #include "WinLauncherWebHost.h"
</span><span class="cx"> #include "Common.cpp"
</span><span class="cx">
</span><ins>+#if USE(GLIB)
+#include <glib.h>
+#endif
+
</ins><span class="cx"> int WINAPI wWinMain(HINSTANCE, HINSTANCE, PWSTR, int nCmdShow)
</span><span class="cx"> {
</span><span class="cx"> #ifdef _CRTDBG_MAP_ALLOC
</span></span></pre></div>
<a id="trunkWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/ChangeLog (173615 => 173616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/ChangeLog 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/WebKitLibraries/ChangeLog 2014-09-15 09:45:01 UTC (rev 173616)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-09-15 peavo@outlook.com <peavo@outlook.com>
+
+ [WinCairo] Make it easier to enable/disable GStreamer.
+ https://bugs.webkit.org/show_bug.cgi?id=135766
+
+ Reviewed by Brent Fulgham.
+
+ Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
+
+ * win/tools/vsprops/GStreamerCommon.props: Add user macro ENABLE_GSTREAMER_WINCAIRO.
+
</ins><span class="cx"> 2014-09-08 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove FILTERS flag
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropsGStreamerCommonprops"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props (173615 => 173616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props 2014-09-15 09:45:01 UTC (rev 173616)
</span><span class="lines">@@ -1,8 +1,24 @@
</span><del>-<?xml version="1.0" encoding="utf-8"?>
</del><ins>+<?xml version="1.0" encoding="utf-8"?>
</ins><span class="cx"> <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><ins>+ <ImportGroup Label="PropertySheets">
+ <Import Project="GStreamer32.props" Condition="$(Platform)=='Win32'" />
+ <Import Project="GStreamer64.props" Condition="$(Platform)=='x64'" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros">
+ <ENABLE_GSTREAMER_WINCAIRO></ENABLE_GSTREAMER_WINCAIRO>
+ </PropertyGroup>
</ins><span class="cx"> <ItemDefinitionGroup>
</span><del>- <Link>
</del><ins>+ <ClCompile>
+ <PreprocessorDefinitions>$(ENABLE_GSTREAMER_WINCAIRO);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link Condition="$(ENABLE_GSTREAMER_WINCAIRO)=='ENABLE_GSTREAMER_WINCAIRO'">
</ins><span class="cx"> <AdditionalDependencies>gstpbutils-1.0.lib;gstaudio-1.0.lib;gstbase-1.0.lib;gstvideo-1.0.lib;gobject-2.0.lib;gstapp-1.0.lib;glib-2.0.lib;gstreamer-1.0.lib;gsttag-1.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
</span><span class="cx"> </Link>
</span><span class="cx"> </ItemDefinitionGroup>
</span><ins>+ <ItemGroup>
+ <BuildMacro Include="ENABLE_GSTREAMER_WINCAIRO">
+ <Value>$(ENABLE_GSTREAMER_WINCAIRO)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ </ItemGroup>
</ins><span class="cx"> </Project>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>