⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 286768 in webkit


Ignore:
Timestamp:
Dec 9, 2021, 12:37:59 AM (5 years ago)
Author:
mmaxfield@apple.com
Message:

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

Unreviewed.

The PAL headers get put in a different place.

Source/WebKit:

No new tests because there is no behavior change.

  • Configurations/BaseTarget.xcconfig:

Source/WebKitLegacy/mac:

  • Configurations/WebKitLegacy.xcconfig:
Location:
trunk/Source
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r286767 r286768  
     12021-12-09  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        [WebGPU] Fix WebGPU build in Apple's internal build system
     4        https://bugs.webkit.org/show_bug.cgi?id=234070
     5
     6        Unreviewed.
     7
     8        The PAL headers get put in a different place.
     9
     10        No new tests because there is no behavior change.
     11
     12        * Configurations/BaseTarget.xcconfig:
     13
    1142021-12-09  Carlos Garcia Campos  <cgarcia@igalia.com>
    215

  • trunk/Source/WebKit/Configurations/BaseTarget.xcconfig

    r286757 r286768  
    4747WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
    4848LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc;
     49WEBGPU_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU $(SDKROOT)/usr/local/include/pal/graphics/WebGPU;
    4950
    5051ALTERNATE_HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS_$(SDK_VARIANT));
    5152ALTERNATE_HEADER_SEARCH_PATHS_iosmac = $(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/include
    5253
    53 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);
     54HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS) $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit $(WEBGPU_HEADER_SEARCH_PATHS) $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(SRCROOT) $(HEADER_SEARCH_PATHS);
    5455
    5556OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r286705 r286768  
     12021-12-09  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        [WebGPU] Fix WebGPU build in Apple's internal build system
     4        https://bugs.webkit.org/show_bug.cgi?id=234070
     5
     6        Unreviewed.
     7
     8        The PAL headers get put in a different place.
     9
     10        * Configurations/WebKitLegacy.xcconfig:
     11
    1122021-12-08  Truitt Savell  <tsavell@apple.com>
    213

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

    r286459 r286768  
    5858WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
    5959LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc;
     60WEBGPU_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU $(SDKROOT)/usr/local/include/pal/graphics/WebGPU;
    6061
    61 HEADER_SEARCH_PATHS = "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" "$(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
     62HEADER_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);
    6263INFOPLIST_FILE = mac/Info.plist;
    6364INSTALL_PATH = $(INSTALL_PATH_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
Note: See TracChangeset for help on using the changeset viewer.