Title: [286770] trunk/Source
- Revision
- 286770
- Author
- mmaxfi...@apple.com
- Date
- 2021-12-09 02:17:26 -0800 (Thu, 09 Dec 2021)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (286769 => 286770)
--- trunk/Source/WebKit/ChangeLog 2021-12-09 08:47:07 UTC (rev 286769)
+++ trunk/Source/WebKit/ChangeLog 2021-12-09 10:17:26 UTC (rev 286770)
@@ -1,5 +1,16 @@
2021-12-09 Myles C. Maxfield <mmaxfi...@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 <mmaxfi...@apple.com>
+
[WebGPU] Fix WebGPU build in Apple's internal build system
https://bugs.webkit.org/show_bug.cgi?id=234070
Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (286769 => 286770)
--- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2021-12-09 08:47:07 UTC (rev 286769)
+++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2021-12-09 10:17:26 UTC (rev 286770)
@@ -46,7 +46,7 @@
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(WK_ENABLE_EXPERIMENTAL_FEATURES) $(WK_CORE_PREDICTION_DEFINES) $(WK_FORMATREADERBUNDLE_CODESIGNING_DEFINES) $(inherited) FRAMEWORK_NAME=WebKit;
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));
ALTERNATE_HEADER_SEARCH_PATHS_iosmac = $(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/include
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (286769 => 286770)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2021-12-09 08:47:07 UTC (rev 286769)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2021-12-09 10:17:26 UTC (rev 286770)
@@ -1,5 +1,14 @@
2021-12-09 Myles C. Maxfield <mmaxfi...@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 <mmaxfi...@apple.com>
+
[WebGPU] Fix WebGPU build in Apple's internal build system
https://bugs.webkit.org/show_bug.cgi?id=234070
Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (286769 => 286770)
--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2021-12-09 08:47:07 UTC (rev 286769)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2021-12-09 10:17:26 UTC (rev 286770)
@@ -57,7 +57,7 @@
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);
INFOPLIST_FILE = mac/Info.plist;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
