<!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>[184209] trunk/Tools</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/184209">184209</a></dd>
<dt>Author</dt> <dd>jacob_nielsen@apple.com</dd>
<dt>Date</dt> <dd>2015-05-12 12:23:51 -0700 (Tue, 12 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix internal build configuration issues
https://bugs.webkit.org/show_bug.cgi?id=144762
Reviewed by David Kilzer.
Modifies DumpRenderTree's xcconfig files to use SDK selectors.
* DumpRenderTree/mac/Configurations/Base.xcconfig:
* DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
* DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
* DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
* DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig:
* DumpRenderTree/mac/Configurations/ImageDiff.xcconfig:
* DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig:
* DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsBasexcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsDebugReleasexcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreexcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreeAppxcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreeLibraryxcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsImageDiffxcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/ImageDiff.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsLayoutTestHelperxcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsTestNetscapePlugInxcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (184208 => 184209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-12 18:40:38 UTC (rev 184208)
+++ trunk/Tools/ChangeLog 2015-05-12 19:23:51 UTC (rev 184209)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-05-12 Jake Nielsen <jacob_nielsen@apple.com>
+
+ Fix internal build configuration issues
+ https://bugs.webkit.org/show_bug.cgi?id=144762
+
+ Reviewed by David Kilzer.
+
+ Modifies DumpRenderTree's xcconfig files to use SDK selectors.
+
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+ * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+ * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
+ * DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
+ * DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig:
+ * DumpRenderTree/mac/Configurations/ImageDiff.xcconfig:
+ * DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig:
+ * DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig:
+
</ins><span class="cx"> 2015-05-12 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Switch to launching iOS Simulator using bundle ID
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (184208 => 184209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2015-05-12 18:40:38 UTC (rev 184208)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2015-05-12 19:23:51 UTC (rev 184209)
</span><span class="lines">@@ -26,14 +26,10 @@
</span><span class="cx"> CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
</span><span class="cx"> CLANG_CXX_LIBRARY = libc++;
</span><span class="cx"> CLANG_WARN_CXX0X_EXTENSIONS = NO;
</span><del>-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport ForwardingHeaders $(HEADER_SEARCH_PATHS_$(PLATFORM_NAME)) $(SRCROOT)/../../Source/JavaScriptCore/icu;
-HEADER_SEARCH_PATHS_iphoneos = $(SDKROOT)/usr/local/include $(SDKROOT)/usr/local/include/WebCoreTestSupport $(SRCROOT)/../../Source/WebKit2/Platform/spi/ios;
-HEADER_SEARCH_PATHS_iphonesimulator = $(HEADER_SEARCH_PATHS_iphoneos);
-HEADER_SEARCH_PATHS_macosx = mac/InternalHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
-FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME));
-FRAMEWORK_SEARCH_PATHS_macosx = $(interited);
-FRAMEWORK_SEARCH_PATHS_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos);
</del><ins>+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport ForwardingHeaders $(PLATFORM_HEADER_SEARCH_PATHS) $(SRCROOT)/../../Source/JavaScriptCore/icu;
+PLATFORM_HEADER_SEARCH_PATHS[sdk=iphone*] = $(SDKROOT)/usr/local/include $(SDKROOT)/usr/local/include/WebCoreTestSupport $(SRCROOT)/../../Source/WebKit2/Platform/spi/ios;
+PLATFORM_HEADER_SEARCH_PATHS[sdk=macosx*] = mac/InternalHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
+FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</ins><span class="cx"> GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(GCC_PREPROCESSOR_DEFINITIONS_$(PLATFORM_NAME)) WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST;
</span><span class="cx"> GCC_PREPROCESSOR_DEFINITIONS_macosx = ENABLE_DASHBOARD_SUPPORT;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (184208 => 184209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2015-05-12 18:40:38 UTC (rev 184208)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2015-05-12 19:23:51 UTC (rev 184209)
</span><span class="lines">@@ -28,25 +28,19 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><del>-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME));
-MACOSX_DEPLOYMENT_TARGET_iphoneos = 10.9;
-MACOSX_DEPLOYMENT_TARGET_iphonesimulator = 10.9;
-MACOSX_DEPLOYMENT_TARGET_macosx = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</del><ins>+MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span><span class="cx">
</span><del>-WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</del><ins>+WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000);
</span><ins>+WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
</ins><span class="cx">
</span><del>-SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
-SDKROOT_iphoneos = $(SDKROOT);
-SDKROOT_iphonesimulator = $(SDKROOT);
-SDKROOT_macosx = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
</del><ins>+SDKROOT[sdk=iphone*] = $(SDKROOT);
+SDKROOT = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
</ins><span class="cx"> SDKROOT_macosx_ = macosx;
</span><span class="cx"> SDKROOT_macosx_YES = macosx.internal;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig (184208 => 184209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2015-05-12 18:40:38 UTC (rev 184208)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2015-05-12 19:23:51 UTC (rev 184209)
</span><span class="lines">@@ -27,6 +27,5 @@
</span><span class="cx"> OTHER_LDFLAGS_macosx = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework Carbon -framework Cocoa -framework JavaScriptCore -framework OpenGL -framework QuartzCore -framework WebKit;
</span><span class="cx"> LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
</span><span class="cx"> PRODUCT_NAME = DumpRenderTree;
</span><del>-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = DumpRenderTreeMain.mm *.ttf *.TTF *.sfont;
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</del><ins>+
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = DumpRenderTreeMain.mm *.ttf *.TTF *.sfont;
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreeAppxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig (184208 => 184209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig 2015-05-12 18:40:38 UTC (rev 184208)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig 2015-05-12 19:23:51 UTC (rev 184209)
</span><span class="lines">@@ -27,10 +27,8 @@
</span><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS_FONTS = -sectcreate __DATA Ahem fonts/AHEM____.TTF -sectcreate __DATA WeightWatcher100 fonts/WebKitWeightWatcher100.ttf -sectcreate __DATA WeightWatcher200 fonts/WebKitWeightWatcher200.ttf -sectcreate __DATA WeightWatcher300 fonts/WebKitWeightWatcher300.ttf -sectcreate __DATA WeightWatcher400 fonts/WebKitWeightWatcher400.ttf -sectcreate __DATA WeightWatcher500 fonts/WebKitWeightWatcher500.ttf -sectcreate __DATA WeightWatcher600 fonts/WebKitWeightWatcher600.ttf -sectcreate __DATA WeightWatcher700 fonts/WebKitWeightWatcher700.ttf -sectcreate __DATA WeightWatcher800 fonts/WebKitWeightWatcher800.ttf -sectcreate __DATA WeightWatcher900 fonts/WebKitWeightWatcher900.ttf -sectcreate __DATA HiraMaruMono-W4 fonts/SampleFont.sfont;
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(OTHER_LDFLAGS_$(PLATFORM_NAME)) $(ASAN_OTHER_LDFLAGS);
-OTHER_LDFLAGS_iphoneos = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework QuartzCore -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework GraphicsServices -framework ImageIO -framework MobileCoreServices -framework UIKit -framework WebCore -framework JavaScriptCore -framework WebKit $(OTHER_LDFLAGS_FONTS);
-OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
</del><ins>+OTHER_LDFLAGS = $(PLATFORM_OTHER_LDFLAGS) $(ASAN_OTHER_LDFLAGS);
+PLATFORM_OTHER_LDFLAGS[sdk=iphone*] = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework QuartzCore -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework GraphicsServices -framework ImageIO -framework MobileCoreServices -framework UIKit -framework WebCore -framework JavaScriptCore -framework WebKit $(OTHER_LDFLAGS_FONTS);
</ins><span class="cx"> LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
</span><span class="cx"> PRODUCT_NAME = DumpRenderTree;
</span><del>-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_macosx = DumpRenderTreeMain.mm;
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = DumpRenderTreeMain.mm;
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsDumpRenderTreeLibraryxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig (184208 => 184209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig 2015-05-12 18:40:38 UTC (rev 184208)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeLibrary.xcconfig 2015-05-12 19:23:51 UTC (rev 184209)
</span><span class="lines">@@ -30,7 +30,5 @@
</span><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS = ;
</span><span class="cx">
</span><del>-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = AccessibilityControllerMac.mm AccessibilityUIElementMac.mm DumpRenderTreeFileDraggingSource.m PixelDumpSupportMac.mm PixelDumpSupportCG.cpp;
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
-EXCLUDED_SOURCE_FILE_NAMES_macosx = AccessibilityUIElementIOS.mm AccessibilityControllerIOS.mm PixelDumpSupportIOS.mm DumpRenderTreeBrowserView.mm;
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = AccessibilityControllerMac.mm AccessibilityUIElementMac.mm DumpRenderTreeFileDraggingSource.m PixelDumpSupportMac.mm PixelDumpSupportCG.cpp;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = AccessibilityUIElementIOS.mm AccessibilityControllerIOS.mm PixelDumpSupportIOS.mm DumpRenderTreeBrowserView.mm;
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsImageDiffxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/ImageDiff.xcconfig (184208 => 184209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/ImageDiff.xcconfig 2015-05-12 18:40:38 UTC (rev 184208)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/ImageDiff.xcconfig 2015-05-12 19:23:51 UTC (rev 184209)
</span><span class="lines">@@ -24,7 +24,5 @@
</span><span class="cx"> #include "BaseTarget.xcconfig"
</span><span class="cx">
</span><span class="cx"> PRODUCT_NAME = ImageDiff;
</span><del>-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa -framework QuartzCore;
-OTHER_LDFLAGS_iphoneos = -framework CoreFoundation -framework CoreGraphics -framework MobileCoreServices -framework ImageIO;
-OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
</del><ins>+OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Carbon -framework Cocoa -framework QuartzCore;
+OTHER_LDFLAGS[sdk=iphone*] = $(inherited) -framework CoreFoundation -framework CoreGraphics -framework MobileCoreServices -framework ImageIO;
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsLayoutTestHelperxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig (184208 => 184209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig 2015-05-12 18:40:38 UTC (rev 184208)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig 2015-05-12 19:23:51 UTC (rev 184209)
</span><span class="lines">@@ -25,5 +25,4 @@
</span><span class="cx">
</span><span class="cx"> #include "BaseTarget.xcconfig"
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa -framework OpenGL -framework IOKit;
</del><ins>+OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Carbon -framework Cocoa -framework OpenGL -framework IOKit;
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsTestNetscapePlugInxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig (184208 => 184209)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig 2015-05-12 18:40:38 UTC (rev 184208)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig 2015-05-12 19:23:51 UTC (rev 184209)
</span><span class="lines">@@ -29,6 +29,4 @@
</span><span class="cx"> INSTALL_PATH = "$(USER_LIBRARY_DIR)/Plugins"
</span><span class="cx"> WARNING_CFLAGS = -Wmost -Wno-four-char-constants -Wno-unknown-pragmas
</span><span class="cx"> LIBRARY_STYLE = BUNDLE
</span><del>-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *;
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *;
</ins></span></pre>
</div>
</div>
</body>
</html>