Changeset 286770 in webkit

Timestamp:

Dec 9, 2021, 2:17:26 AM (5 years ago)

Author:

mmaxfield@apple.com

Message:

[WebGPU] [MacCatalyst] Fix WebGPU Mac Catalyst build in Apple's internal build system
​https://bugs.webkit.org/show_bug.cgi?id=234072

Unreviewed.

Source/WebKit:

No new tests because there is no behavior change.

• Configurations/BaseTarget.xcconfig:

Source/WebKitLegacy/mac:

• Configurations/WebKitLegacy.xcconfig:

Location:

trunk/Source

Files:

• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Configurations/BaseTarget.xcconfig (modified) (1 diff)
• WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-09  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [WebGPU] [MacCatalyst] Fix WebGPU Mac Catalyst build in Apple's internal build system
+        https://bugs.webkit.org/show_bug.cgi?id=234072
+
+        Unreviewed.
+
+        No new tests because there is no behavior change.
+
+        * Configurations/BaseTarget.xcconfig:
+
 2021-12-09  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebKit/Configurations/BaseTarget.xcconfig

@@ -47 +47 @@
 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;
-WEBGPU_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU $(SDKROOT)/usr/local/include/pal/graphics/WebGPU;
+WEBGPU_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU $(SDKROOT)$(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/include/pal/graphics/WebGPU;
 
 ALTERNATE_HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS_$(SDK_VARIANT));

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2021-12-09  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [WebGPU] [MacCatalyst] Fix WebGPU Mac Catalyst build in Apple's internal build system
+        https://bugs.webkit.org/show_bug.cgi?id=234072
+
+        Unreviewed.
+
+        * Configurations/WebKitLegacy.xcconfig:
+
 2021-12-09  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig

@@ -58 +58 @@
 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;
-WEBGPU_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU $(SDKROOT)/usr/local/include/pal/graphics/WebGPU;
+WEBGPU_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU $(SDKROOT)$(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/include/pal/graphics/WebGPU;
 
 HEADER_SEARCH_PATHS = "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBGPU_HEADER_SEARCH_PATHS) $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);