- Restore pcre target to webkit.xcodeproj

 - Fix include path used for wtf target: need to put JavaScriptCore/kjs before
   generated/WebCore in order for the wtf target to pick up the correct
   config.h (this was the source of the WTF_CHANGES confusion)
Review URL: http://codereview.chromium.org/1801

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1842 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 109 insertions, 48 deletions

diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index e6f46ac..9d396ff 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -16,7 +16,7 @@
 			dependencies = (
 			);
 			name = jsconfig;
-			productName = JSConfig;
+			productName = jsconfig;
 		};
 		E45627B70E2691D0005E4685 /* All */ = {
 			isa = PBXAggregateTarget;
@@ -26,6 +26,7 @@
 			dependencies = (
 				E45627CB0E26928A005E4685 /* PBXTargetDependency */,
 				E45627B80E2691D0005E4685 /* PBXTargetDependency */,
+				7BF892040E73143E000BAF8A /* PBXTargetDependency */,
 				E45627F60E2694D6005E4685 /* PBXTargetDependency */,
 				E45627C50E26921D005E4685 /* PBXTargetDependency */,
 				E45627BC0E2691D0005E4685 /* PBXTargetDependency */,
@@ -315,6 +316,11 @@
 		7B5E86090D7F28F5001ECF42 /* TCSystemAlloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E85D80D7F28F5001ECF42 /* TCSystemAlloc.cpp */; };
 		7B5E860E0D7F28F5001ECF42 /* UTF8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E85E00D7F28F5001ECF42 /* UTF8.cpp */; };
 		7B5E862C0D7F2B56001ECF42 /* FastMalloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E85BA0D7F28F5001ECF42 /* FastMalloc.cpp */; };
+		7BF891E80E7311B1000BAF8A /* pcre_compile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7BF891E00E7311B1000BAF8A /* pcre_compile.cpp */; };
+		7BF891E90E7311B1000BAF8A /* pcre_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7BF891E30E7311B1000BAF8A /* pcre_tables.cpp */; };
+		7BF891EA0E7311B1000BAF8A /* pcre_ucp_searchfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7BF891E40E7311B1000BAF8A /* pcre_ucp_searchfuncs.cpp */; };
+		7BF891EB0E7311B1000BAF8A /* pcre_xclass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7BF891E50E7311B1000BAF8A /* pcre_xclass.cpp */; };
+		7BF892080E7314E9000BAF8A /* pcre_exec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7BF891E10E7311B1000BAF8A /* pcre_exec.cpp */; };
 		82761E970E3FA26F0030D324 /* TextCodecMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E91C50D7F3CC2001ECF42 /* TextCodecMac.cpp */; };
 		82761F850E3FAC700030D324 /* AccessibilityObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82761F810E3FAC700030D324 /* AccessibilityObject.cpp */; };
 		82A9A8CF0E3E4EE80038C474 /* FrameMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8F000D7F3C48001ECF42 /* FrameMac.mm */; };
@@ -1155,75 +1161,89 @@
 			remoteGlobalIDString = 7B58F7A60DAFC59B006F0EB5;
 			remoteInfo = jsconfig;
 		};
+		7BF891F30E731305000BAF8A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7B5E77560D7F22D8001ECF42 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 7B58F7A60DAFC59B006F0EB5;
+			remoteInfo = jsconfig;
+		};
+		7BF892030E73143E000BAF8A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7B5E77560D7F22D8001ECF42 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 7B27489C0E43815F009BCE03;
+			remoteInfo = pcre;
+		};
 		7BFD8E6C0DAFE79A0084BC4B /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7B5E77560D7F22D8001ECF42 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 7B58F7A60DAFC59B006F0EB5;
-			remoteInfo = V8Config;
+			remoteInfo = jsconfig;
 		};
 		E43CE13E0E68665900D8C5B9 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7B5E77560D7F22D8001ECF42 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 7B58F7A60DAFC59B006F0EB5;
-			remoteInfo = JSConfig;
+			remoteInfo = jsconfig;
 		};
 		E43CE1410E68686400D8C5B9 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7B5E77560D7F22D8001ECF42 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 7BFD8E650DAFE7630084BC4B;
-			remoteInfo = JSBindings;
+			remoteInfo = jsbindings;
 		};
 		E45627B40E26917C005E4685 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7B5E77560D7F22D8001ECF42 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = E45620380E268E87005E4685;
-			remoteInfo = "WebCore (V8-Chrome)";
+			remoteInfo = webcore;
 		};
 		E45627B90E2691D0005E4685 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7B5E77560D7F22D8001ECF42 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 7BFD8E650DAFE7630084BC4B;
-			remoteInfo = "JSBindings (V8)";
+			remoteInfo = jsbindings;
 		};
 		E45627BD0E2691D0005E4685 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7B5E77560D7F22D8001ECF42 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 7B5E85AD0D7F28CD001ECF42;
-			remoteInfo = WTF;
+			remoteInfo = wtf;
 		};
 		E45627C40E26921D005E4685 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7B5E77560D7F22D8001ECF42 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = E45620380E268E87005E4685;
-			remoteInfo = "WebCore (V8-Chrome)";
+			remoteInfo = webcore;
 		};
 		E45627CA0E26928A005E4685 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7B5E77560D7F22D8001ECF42 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = E45626A20E268F03005E4685;
-			remoteInfo = "Glue (V8-Chrome)";
+			remoteInfo = glue;
 		};
 		E45627F50E2694D6005E4685 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7B5E77560D7F22D8001ECF42 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = E45627CF0E2694B8005E4685;
-			remoteInfo = "Port (V8-Chrome)";
+			remoteInfo = port;
 		};
 		E45627FA0E2694E0005E4685 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 7B5E77560D7F22D8001ECF42 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = E45620380E268E87005E4685;
-			remoteInfo = "WebCore (V8-Chrome)";
+			remoteInfo = webcore;
 		};
 /* End PBXContainerItemProxy section */
 
@@ -3454,6 +3474,16 @@
 		7BF8842E0E71C120000BAF8A /* executable.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = executable.xcconfig; sourceTree = "<group>"; };
 		7BF8842F0E71C120000BAF8A /* release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = "<group>"; };
 		7BF884300E71C120000BAF8A /* staticlib.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = staticlib.xcconfig; sourceTree = "<group>"; };
+		7BF891DF0E7311B1000BAF8A /* pcre.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pcre.h; sourceTree = "<group>"; };
+		7BF891E00E7311B1000BAF8A /* pcre_compile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pcre_compile.cpp; sourceTree = "<group>"; };
+		7BF891E10E7311B1000BAF8A /* pcre_exec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pcre_exec.cpp; path = ../../../../webkit/pending/pcre_exec.cpp; sourceTree = "<group>"; };
+		7BF891E20E7311B1000BAF8A /* pcre_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pcre_internal.h; sourceTree = "<group>"; };
+		7BF891E30E7311B1000BAF8A /* pcre_tables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pcre_tables.cpp; sourceTree = "<group>"; };
+		7BF891E40E7311B1000BAF8A /* pcre_ucp_searchfuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pcre_ucp_searchfuncs.cpp; sourceTree = "<group>"; };
+		7BF891E50E7311B1000BAF8A /* pcre_xclass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pcre_xclass.cpp; sourceTree = "<group>"; };
+		7BF891E60E7311B1000BAF8A /* ucpinternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ucpinternal.h; sourceTree = "<group>"; };
+		7BF891E70E7311B1000BAF8A /* ucptable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ucptable.cpp; sourceTree = "<group>"; };
+		7BF891FD0E731414000BAF8A /* chartables.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = chartables.c; sourceTree = "<group>"; };
 		7BFD8E660DAFE7630084BC4B /* libjsbindings.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjsbindings.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		820A61930DE7592C00871E2D /* WebCoreURLResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreURLResponse.h; sourceTree = "<group>"; };
 		820A61940DE7592C00871E2D /* WebCoreURLResponse.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreURLResponse.mm; sourceTree = "<group>"; };
@@ -3783,15 +3813,6 @@
 			path = history;
 			sourceTree = "<group>";
 		};
-		7B14AAA40DE333B000F4E646 /* v8 */ = {
-			isa = PBXGroup;
-			children = (
-				7BF88A0E0E71D012000BAF8A /* bindings */,
-			);
-			name = v8;
-			path = generated/DerivedSources/v8;
-			sourceTree = "<group>";
-		};
 		7B2B0A440E3143EC00D4C6B7 /* gif */ = {
 			isa = PBXGroup;
 			children = (
@@ -3837,6 +3858,7 @@
 				7BF889C10E71CEA6000BAF8A /* generated */,
 				825404E50D92E3BB0006B936 /* glue */,
 				7B0091290DAFEF0E00F72082 /* jsbindings */,
+				7BF891DD0E73118C000BAF8A /* pcre */,
 				7B9375960D919010008B9587 /* port */,
 				7B5E87820D7F394A001ECF42 /* webcore */,
 				7B5E85B30D7F28F5001ECF42 /* wtf */,
@@ -5869,10 +5891,11 @@
 		7BF889C10E71CEA6000BAF8A /* generated */ = {
 			isa = PBXGroup;
 			children = (
-				7B14AAA40DE333B000F4E646 /* v8 */,
+				7BF88A0E0E71D012000BAF8A /* bindings */,
+				7BF891F60E731344000BAF8A /* pcre */,
 				7BF88A0D0E71CFFD000BAF8A /* WebCore */,
 			);
-			name = generated;
+			path = generated;
 			sourceTree = CONFIGURATION_TEMP_DIR;
 		};
 		7BF88A0D0E71CFFD000BAF8A /* WebCore */ = {
@@ -5881,7 +5904,7 @@
 				7BBFD2130DB7D09D00C447C7 /* config.h */,
 			);
 			name = WebCore;
-			path = generated/WebCore/v8;
+			path = WebCore/v8;
 			sourceTree = "<group>";
 		};
 		7BF88A0E0E71D012000BAF8A /* bindings */ = {
@@ -6399,7 +6422,33 @@
 				7B0095C70DAFF00100F72082 /* XPathGrammar.cpp */,
 				7B0095C80DAFF00100F72082 /* XPathGrammar.h */,
 			);
-			path = bindings;
+			name = bindings;
+			path = DerivedSources/v8/bindings;
+			sourceTree = "<group>";
+		};
+		7BF891DD0E73118C000BAF8A /* pcre */ = {
+			isa = PBXGroup;
+			children = (
+				7BF891DF0E7311B1000BAF8A /* pcre.h */,
+				7BF891E00E7311B1000BAF8A /* pcre_compile.cpp */,
+				7BF891E10E7311B1000BAF8A /* pcre_exec.cpp */,
+				7BF891E20E7311B1000BAF8A /* pcre_internal.h */,
+				7BF891E30E7311B1000BAF8A /* pcre_tables.cpp */,
+				7BF891E40E7311B1000BAF8A /* pcre_ucp_searchfuncs.cpp */,
+				7BF891E50E7311B1000BAF8A /* pcre_xclass.cpp */,
+				7BF891E60E7311B1000BAF8A /* ucpinternal.h */,
+				7BF891E70E7311B1000BAF8A /* ucptable.cpp */,
+			);
+			name = pcre;
+			path = ../third_party/WebKit/JavaScriptCore/pcre;
+			sourceTree = "<group>";
+		};
+		7BF891F60E731344000BAF8A /* pcre */ = {
+			isa = PBXGroup;
+			children = (
+				7BF891FD0E731414000BAF8A /* chartables.c */,
+			);
+			path = pcre;
 			sourceTree = "<group>";
 		};
 		822B1BE60DC778FF005C9A96 /* platform */ = {
@@ -6670,9 +6719,10 @@
 			buildRules = (
 			);
 			dependencies = (
+				7BF891F40E731305000BAF8A /* PBXTargetDependency */,
 			);
 			name = pcre;
-			productName = PCRE;
+			productName = pcre;
 			productReference = 7B27489D0E43815F009BCE03 /* libpcre.a */;
 			productType = "com.apple.product-type.library.static";
 		};
@@ -6689,7 +6739,7 @@
 				7BF88B780E71F3FA000BAF8A /* PBXTargetDependency */,
 			);
 			name = wtf;
-			productName = WTF;
+			productName = wtf;
 			productReference = 7B5E85AE0D7F28CD001ECF42 /* libwtf.a */;
 			productType = "com.apple.product-type.library.static";
 		};
@@ -6707,7 +6757,7 @@
 				7BFD8E6D0DAFE79A0084BC4B /* PBXTargetDependency */,
 			);
 			name = jsbindings;
-			productName = V8Bindings;
+			productName = jsbindings;
 			productReference = 7BFD8E660DAFE7630084BC4B /* libjsbindings.a */;
 			productType = "com.apple.product-type.library.static";
 		};
@@ -6722,11 +6772,11 @@
 			buildRules = (
 			);
 			dependencies = (
-				E43CE13F0E68665900D8C5B9 /* PBXTargetDependency */,
 				E43CE1420E68686400D8C5B9 /* PBXTargetDependency */,
+				E43CE13F0E68665900D8C5B9 /* PBXTargetDependency */,
 			);
 			name = webcore;
-			productName = WebCore;
+			productName = webcore;
 			productReference = E45626950E268E87005E4685 /* libwebcore.a */;
 			productType = "com.apple.product-type.library.static";
 		};
@@ -6743,7 +6793,7 @@
 				E45627B50E26917C005E4685 /* PBXTargetDependency */,
 			);
 			name = glue;
-			productName = Glue;
+			productName = glue;
 			productReference = E45627150E268F03005E4685 /* libglue.a */;
 			productType = "com.apple.product-type.library.static";
 		};
@@ -6760,7 +6810,7 @@
 				E45627FB0E2694E0005E4685 /* PBXTargetDependency */,
 			);
 			name = port;
-			productName = Port;
+			productName = port;
 			productReference = E45627F40E2694B8005E4685 /* libport.a */;
 			productType = "com.apple.product-type.library.static";
 		};
@@ -6796,13 +6846,15 @@
 			files = (
 			);
 			inputPaths = (
+				"$(SRCROOT)/../third_party/WebKit/JavaScriptCore/pcre/dftables",
 			);
 			name = "Generate Derived Sources";
 			outputPaths = (
+				"$(CONFIGURATION_TEMP_DIR)/generated/pcre/chartables.c",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -ex\nGENERATED_DIR=\"${CONFIGURATON_TEMP_DIR}/generated\"\nOUTDIR=\"${GENERATED_DIR}/pcre\"\nCHARTABLES=\"${OUTDIR}/chartables.c\"\nDFTABLES=\"${SOURCE_ROOT}/../third_party/WebKit/JavaScriptCore/pcre/dftables\"\nif [ ! -e \"${CHARTABLES}\" ] || [ \"${DFTABLES}\" -nt \"${CHARTABLES}\" ] ; then\n  mkdir -p \"${OUTDIR}\"\n  \"${DFTABLES}\" \"${CHARTABLES}\"\nfi\n";
+			shellScript = "set -ex\nGENERATED_DIR=\"${CONFIGURATION_TEMP_DIR}/generated\"\nOUTDIR=\"${GENERATED_DIR}/pcre\"\nCHARTABLES=\"${OUTDIR}/chartables.c\"\nDFTABLES=\"${SOURCE_ROOT}/../third_party/WebKit/JavaScriptCore/pcre/dftables\"\n\nmkdir -p \"${OUTDIR}\"\nperl -w \"${DFTABLES}\" \"${CHARTABLES}\"\n";
 		};
 		7B58F7A70DAFC59B006F0EB5 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -6852,6 +6904,11 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				7BF891E80E7311B1000BAF8A /* pcre_compile.cpp in Sources */,
+				7BF892080E7314E9000BAF8A /* pcre_exec.cpp in Sources */,
+				7BF891E90E7311B1000BAF8A /* pcre_tables.cpp in Sources */,
+				7BF891EA0E7311B1000BAF8A /* pcre_ucp_searchfuncs.cpp in Sources */,
+				7BF891EB0E7311B1000BAF8A /* pcre_xclass.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -8008,6 +8065,16 @@
 			target = 7B58F7A60DAFC59B006F0EB5 /* jsconfig */;
 			targetProxy = 7BF88B770E71F3FA000BAF8A /* PBXContainerItemProxy */;
 		};
+		7BF891F40E731305000BAF8A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 7B58F7A60DAFC59B006F0EB5 /* jsconfig */;
+			targetProxy = 7BF891F30E731305000BAF8A /* PBXContainerItemProxy */;
+		};
+		7BF892040E73143E000BAF8A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 7B27489C0E43815F009BCE03 /* pcre */;
+			targetProxy = 7BF892030E73143E000BAF8A /* PBXContainerItemProxy */;
+		};
 		7BFD8E6D0DAFE79A0084BC4B /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 7B58F7A60DAFC59B006F0EB5 /* jsconfig */;
@@ -8066,10 +8133,10 @@
 			baseConfigurationReference = 7BF884300E71C120000BAF8A /* staticlib.xcconfig */;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
-					"$(BUILT_PRODUCTS_DIR)/DerivedSources/PCRE",
-					pending,
-					../third_party/WebKit/JavaScriptCore,
-					../third_party/icu38/public/common,
+					"$(HEADER_SEARCH_PATHS)",
+					"$(DIR_WEBKIT)/JavaScriptCore/pcre",
+					"$(CONFIGURATION_TEMP_DIR)/generated/pcre",
+					"$(CONFIGURATION_TEMP_DIR)/generated/WebCore/v8",
 				);
 				PRODUCT_NAME = pcre;
 			};
@@ -8080,10 +8147,10 @@
 			baseConfigurationReference = 7BF884300E71C120000BAF8A /* staticlib.xcconfig */;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
-					"$(BUILT_PRODUCTS_DIR)/DerivedSources/PCRE",
-					pending,
-					../third_party/WebKit/JavaScriptCore,
-					../third_party/icu38/public/common,
+					"$(HEADER_SEARCH_PATHS)",
+					"$(DIR_WEBKIT)/JavaScriptCore/pcre",
+					"$(CONFIGURATION_TEMP_DIR)/generated/pcre",
+					"$(CONFIGURATION_TEMP_DIR)/generated/WebCore/v8",
 				);
 				PRODUCT_NAME = pcre;
 			};
@@ -8325,11 +8392,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7BF884300E71C120000BAF8A /* staticlib.xcconfig */;
 			buildSettings = {
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"$(GCC_PREPROCESSOR_DEFINITIONS)",
-					"WTF_CHANGES=1",
-				);
 				HEADER_SEARCH_PATHS = (
+					"$(DIR_WEBKIT)/JavaScriptCore/kjs",
 					"$(HEADER_SEARCH_PATHS)",
 					"$(CONFIGURATION_TEMP_DIR)/generated/WebCore/v8",
 				);
@@ -8341,11 +8405,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7BF884300E71C120000BAF8A /* staticlib.xcconfig */;
 			buildSettings = {
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"$(GCC_PREPROCESSOR_DEFINITIONS)",
-					"WTF_CHANGES=1",
-				);
 				HEADER_SEARCH_PATHS = (
+					"$(DIR_WEBKIT)/JavaScriptCore/kjs",
 					"$(HEADER_SEARCH_PATHS)",
 					"$(CONFIGURATION_TEMP_DIR)/generated/WebCore/v8",
 				);