Changeset 139761 in webkit


Ignore:
Timestamp:
Jan 15, 2013 11:17:09 AM (11 years ago)
Author:
ddkilzer@apple.com
Message:

Upstream iOS changes for ANGLE project
<​http://webkit.org/b/106913>

Reviewed by Joseph Pecoraro.

  • ANGLE.xcodeproj/project.pbxproj:
  • Use $(INSTALL_PATH_PREFIX) with CopyFiles build phase paths.
  • Add iOS.xcconfig to project.
  • Configurations/ANGLE.xcconfig:
  • Use INSTALL_PATH_ACTUAL instead of INSTALL_PATH. (See below.)
  • Use $(INSTALL_PATH_PREFIX) with PUBLIC_HEADERS_FOLDER_PATH.
  • Configurations/Base.xcconfig:
  • Include iOS.xcconfig.
  • Add per-platform values for GCC_ENABLE_OBJC_GC and GCC_MODEL_TUNING.
  • Define INSTALL_PATH when building for macosx SDK.
  • Configurations/iOS.xcconfig: Add. Note that missing include

files are simply ignored without an error by Xcode.

Location:
trunk/Source/ThirdParty/ANGLE
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

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

    r139717 r139761  
    115115                        isa = PBXCopyFilesBuildPhase;
    116116                        buildActionMask = 8;
    117                         dstPath = /usr/local/OpenSourceVersions;
     117                        dstPath = "$(INSTALL_PATH_PREFIX)/usr/local/OpenSourceVersions";
    118118                        dstSubfolderSpec = 0;
    119119                        files = (
    … …  
    125125                        isa = PBXCopyFilesBuildPhase;
    126126                        buildActionMask = 8;
    127                         dstPath = /usr/local/OpenSourceLicenses;
     127                        dstPath = "$(INSTALL_PATH_PREFIX)/usr/local/OpenSourceLicenses";
    128128                        dstSubfolderSpec = 0;
    129129                        files = (
    … …  
    139139                3158EA0C1630968D006BE5EE /* ArrayBoundsClamper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArrayBoundsClamper.cpp; sourceTree = "<group>"; };
    140140                3158EA0D1630968D006BE5EE /* ArrayBoundsClamper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrayBoundsClamper.h; sourceTree = "<group>"; };
     141                443A3E1512ECF6CC0004F9D7 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
    141142                49951C0214B7AAB30060E96E /* length_limits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = length_limits.h; sourceTree = "<group>"; };
    142143                49951C0514B7AAD70060E96E /* BuiltInFunctionEmulator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BuiltInFunctionEmulator.cpp; sourceTree = "<group>"; };
    … …  
    291292                                5D7C59C61208C68B001C873E /* Base.xcconfig */,
    292293                                5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */,
     294                                443A3E1512ECF6CC0004F9D7 /* iOS.xcconfig */,
    293295                        );
    294296                        path = Configurations;

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r139758 r139761  
     12013-01-15  David Kilzer  <ddkilzer@apple.com>
     2
     3        Upstream iOS changes for ANGLE project
     4        <http://webkit.org/b/106913>
     5
     6        Reviewed by Joseph Pecoraro.
     7
     8        * ANGLE.xcodeproj/project.pbxproj:
     9        - Use $(INSTALL_PATH_PREFIX) with CopyFiles build phase paths.
     10        - Add iOS.xcconfig to project.
     11        * Configurations/ANGLE.xcconfig:
     12        - Use INSTALL_PATH_ACTUAL instead of INSTALL_PATH.  (See below.)
     13        - Use $(INSTALL_PATH_PREFIX) with PUBLIC_HEADERS_FOLDER_PATH.
     14        * Configurations/Base.xcconfig:
     15        - Include iOS.xcconfig.
     16        - Add per-platform values for GCC_ENABLE_OBJC_GC and
     17          GCC_MODEL_TUNING.
     18        - Define INSTALL_PATH when building for macosx SDK.
     19        * Configurations/iOS.xcconfig: Add.  Note that missing include
     20        files are simply ignored without an error by Xcode.
     21
    1222013-01-15  David Kilzer  <ddkilzer@apple.com>
    223

  • trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE.xcconfig

    r64597 r139761  
    22
    33HEADER_SEARCH_PATHS = include src;
    4 INSTALL_PATH = /usr/local/lib;
    5 PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/ANGLE;
     4INSTALL_PATH_ACTUAL = /usr/local/lib;
     5PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/ANGLE;

  • trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig

    r139758 r139761  
     1#include "iOS.xcconfig"
     2
    13CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
    24CLANG_CXX_LIBRARY = libc++;
    … …  
    810GCC_ENABLE_CPP_RTTI = NO;
    911GCC_ENABLE_OBJC_EXCEPTIONS = YES;
    10 GCC_ENABLE_OBJC_GC = supported;
     12GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
     13GCC_ENABLE_OBJC_GC_iphoneos = NO;
     14GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
     15GCC_ENABLE_OBJC_GC_macosx = supported;
    1116GCC_ENABLE_SYMBOL_SEPARATION = NO;
    1217GCC_FAST_OBJC_DISPATCH = YES;
    13 GCC_MODEL_TUNING = G5;
     18GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(PLATFORM_NAME));
     19GCC_MODEL_TUNING_macosx = G5;
    1420GCC_OBJC_CALL_CXX_CDTORS = YES;
    1521GCC_OPTIMIZATION_LEVEL = s;
    … …  
    3440TARGETING_SAME_OS_X_VERSION_1090_1090 = YES;
    3541
     42// Make macosx SDK builds work without AspenFamily.xcconfig.
     43INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
     44
    3645// Don't build against an SDK unless we're targeting an older OS version.
    3746SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
Note: See TracChangeset for help on using the changeset viewer.