Changeset 264693 in webkit


Ignore:
Timestamp:
Jul 21, 2020 10:08:44 PM (4 years ago)
Author:
jer.noble@apple.com
Message:

Unreviewed build fix after r264685; copy headers to the correct path during a DEPLOYMENT_LOCATION build.

  • Configurations/libwebm.xcconfig:
  • libwebrtc.xcodeproj/project.pbxproj:
Location:
trunk/Source/ThirdParty/libwebrtc
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r264685 r264693  
     12020-07-21  Jer Noble  <jer.noble@apple.com>
     2
     3        Unreviewed build fix after r264685; copy headers to the correct path during a DEPLOYMENT_LOCATION build.
     4
     5        * Configurations/libwebm.xcconfig:
     6        * libwebrtc.xcodeproj/project.pbxproj:
     7
    182020-07-21  Jer Noble  <jer.noble@apple.com>
    29

  • trunk/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig

    r264685 r264693  
    99
    1010INSTALL_PATH = /usr/local/lib;
    11 PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include;
    1211USE_HEADERMAP = NO;
    1312
     13INSTALL_HEADERS_PATH = /usr/local/include;
     14LIBWEBM_HEADERS_FOLDER_PATH = $(LIBWEBM_HEADERS_FOLDER_PATH_$(DEPLOYMENT_LOCATION));
     15LIBWEBM_HEADERS_FOLDER_PATH_NO = $(BUILT_PRODUCTS_DIR)/$(INSTALL_HEADERS_PATH);
     16LIBWEBM_HEADERS_FOLDER_PATH_YES = $(INSTALL_HEADERS_PATH);

  • trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj

    r264685 r264693  
    41864186                        isa = PBXCopyFilesBuildPhase;
    41874187                        buildActionMask = 2147483647;
    4188                         dstPath = usr/local/include/webm;
    4189                         dstSubfolderSpec = 16;
     4188                        dstPath = "$(LIBWEBM_HEADERS_FOLDER_PATH)/webm";
     4189                        dstSubfolderSpec = 0;
    41904190                        files = (
    41914191                                CDFD2FC524C4DAF70048DAC3 /* buffer_reader.h in Copy webm headers */,
    … …  
    42064206                        isa = PBXCopyFilesBuildPhase;
    42074207                        buildActionMask = 2147483647;
    4208                         dstPath = usr/local/include/common;
    4209                         dstSubfolderSpec = 16;
     4208                        dstPath = "$(LIBWEBM_HEADERS_FOLDER_PATH)/common";
     4209                        dstSubfolderSpec = 0;
    42104210                        files = (
    42114211                                CDFD2FD024C4DB2F0048DAC3 /* vp9_header_parser.h in Copy common headers */,
Note: See TracChangeset for help on using the changeset viewer.