Title: [286757] trunk
- Revision
- 286757
- Author
- [email protected]
- Date
- 2021-12-08 18:35:12 -0800 (Wed, 08 Dec 2021)
Log Message
[MacCatalyst] Update header search paths for ANGLE Catalyst
https://bugs.webkit.org/show_bug.cgi?id=233996
For iOSMac builds, search for ANGLE public headers inside System/iOSSupport
Reviewed by Dean Jackson.
Source/WebKit:
* Configurations/BaseTarget.xcconfig:
Tools:
* TestWebKitAPI/Configurations/Base.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (286756 => 286757)
--- trunk/Source/WebKit/ChangeLog 2021-12-09 02:09:47 UTC (rev 286756)
+++ trunk/Source/WebKit/ChangeLog 2021-12-09 02:35:12 UTC (rev 286757)
@@ -1,3 +1,14 @@
+2021-12-08 Kyle Piddington <[email protected]>
+
+ [MacCatalyst] Update header search paths for ANGLE Catalyst
+ https://bugs.webkit.org/show_bug.cgi?id=233996
+
+ For iOSMac builds, search for ANGLE public headers inside System/iOSSupport
+
+ Reviewed by Dean Jackson.
+
+ * Configurations/BaseTarget.xcconfig:
+
2021-12-08 Jer Noble <[email protected]>
Add an experimental trackConfiguration accessor on AudioTrack & VideoTrack.
Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (286756 => 286757)
--- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2021-12-09 02:09:47 UTC (rev 286756)
+++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2021-12-09 02:35:12 UTC (rev 286757)
@@ -47,8 +47,11 @@
WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc;
-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit "$(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(SRCROOT) $(HEADER_SEARCH_PATHS);
+ALTERNATE_HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS_$(SDK_VARIANT));
+ALTERNATE_HEADER_SEARCH_PATHS_iosmac = $(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/include
+HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS) $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit "$(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(SRCROOT) $(HEADER_SEARCH_PATHS);
+
OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
Modified: trunk/Tools/ChangeLog (286756 => 286757)
--- trunk/Tools/ChangeLog 2021-12-09 02:09:47 UTC (rev 286756)
+++ trunk/Tools/ChangeLog 2021-12-09 02:35:12 UTC (rev 286757)
@@ -1,3 +1,14 @@
+2021-12-08 Kyle Piddington <[email protected]>
+
+ [MacCatalyst] Update header search paths for ANGLE Catalyst
+ https://bugs.webkit.org/show_bug.cgi?id=233996
+
+ For iOSMac builds, search for ANGLE public headers inside System/iOSSupport
+
+ Reviewed by Dean Jackson.
+
+ * TestWebKitAPI/Configurations/Base.xcconfig:
+
2021-12-08 Alex Christensen <[email protected]>
Add SPI to load a resource in the context of a page
Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (286756 => 286757)
--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2021-12-09 02:09:47 UTC (rev 286756)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2021-12-09 02:35:12 UTC (rev 286757)
@@ -33,8 +33,12 @@
CLANG_CXX_LIBRARY = libc++;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
-HEADER_SEARCH_PATHS = ${BUILT_PRODUCTS_DIR}/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport ${SRCROOT} $(SRCROOT)/../../Source/WebKit/Platform/cocoa;
+ALTERNATE_HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS_$(SDK_VARIANT));
+ALTERNATE_HEADER_SEARCH_PATHS_iosmac = $(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/include
+
+HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS) ${BUILT_PRODUCTS_DIR}/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport ${SRCROOT} $(SRCROOT)/../../Source/WebKit/Platform/cocoa;
+
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 $(GCC_PREPROCESSOR_DEFINITIONS_$(PLATFORM_NAME));
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
