Changeset 264746 in webkit
- Timestamp:
- Jul 22, 2020, 9:49:02 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 71 edited
-
PerformanceTests/ChangeLog (modified) (1 diff)
-
PerformanceTests/MediaTime/Configurations/Base.xcconfig (modified) (1 diff)
-
PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig (modified) (1 diff)
-
Source/JavaScriptCore/ChangeLog (modified) (1 diff)
-
Source/JavaScriptCore/Configurations/Base.xcconfig (modified) (1 diff)
-
Source/JavaScriptCore/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Source/JavaScriptCore/Configurations/Version.xcconfig (modified) (1 diff)
-
Source/JavaScriptCore/Configurations/WebKitTargetConditionals.xcconfig (modified) (5 diffs)
-
Source/ThirdParty/ANGLE/ChangeLog (modified) (1 diff)
-
Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (modified) (1 diff)
-
Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Source/ThirdParty/ANGLE/Configurations/Version.xcconfig (modified) (1 diff)
-
Source/ThirdParty/ANGLE/Configurations/WebKitTargetConditionals.xcconfig (modified) (5 diffs)
-
Source/ThirdParty/ChangeLog (modified) (1 diff)
-
Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig (modified) (1 diff)
-
Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig (modified) (1 diff)
-
Source/ThirdParty/libwebrtc/ChangeLog (modified) (1 diff)
-
Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig (modified) (1 diff)
-
Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (modified) (1 diff)
-
Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig (modified) (5 diffs)
-
Source/WTF/ChangeLog (modified) (1 diff)
-
Source/WTF/Configurations/Base.xcconfig (modified) (1 diff)
-
Source/WTF/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Source/WTF/wtf/PlatformHave.h (modified) (1 diff)
-
Source/WebCore/ChangeLog (modified) (1 diff)
-
Source/WebCore/Configurations/Base.xcconfig (modified) (1 diff)
-
Source/WebCore/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Source/WebCore/Configurations/Version.xcconfig (modified) (1 diff)
-
Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig (modified) (5 diffs)
-
Source/WebCore/PAL/ChangeLog (modified) (1 diff)
-
Source/WebCore/PAL/Configurations/Base.xcconfig (modified) (1 diff)
-
Source/WebCore/PAL/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Source/WebCore/PAL/Configurations/Version.xcconfig (modified) (1 diff)
-
Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig (modified) (5 diffs)
-
Source/WebInspectorUI/ChangeLog (modified) (1 diff)
-
Source/WebInspectorUI/Configurations/Base.xcconfig (modified) (1 diff)
-
Source/WebInspectorUI/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Source/WebInspectorUI/Configurations/Version.xcconfig (modified) (1 diff)
-
Source/WebInspectorUI/Configurations/WebKitTargetConditionals.xcconfig (modified) (5 diffs)
-
Source/WebKit/ChangeLog (modified) (1 diff)
-
Source/WebKit/Configurations/Base.xcconfig (modified) (1 diff)
-
Source/WebKit/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Source/WebKit/Configurations/Version.xcconfig (modified) (1 diff)
-
Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig (modified) (5 diffs)
-
Source/WebKitLegacy/mac/ChangeLog (modified) (1 diff)
-
Source/WebKitLegacy/mac/Configurations/Base.xcconfig (modified) (1 diff)
-
Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Source/WebKitLegacy/mac/Configurations/Version.xcconfig (modified) (1 diff)
-
Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig (modified) (5 diffs)
-
Source/bmalloc/ChangeLog (modified) (1 diff)
-
Source/bmalloc/Configurations/Base.xcconfig (modified) (1 diff)
-
Source/bmalloc/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Tools/ChangeLog (modified) (1 diff)
-
Tools/ContentExtensionTester/Configurations/Base.xcconfig (modified) (1 diff)
-
Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (modified) (1 diff)
-
Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Tools/ImageDiff/cg/Configurations/Base.xcconfig (modified) (1 diff)
-
Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Tools/MiniBrowser/Configurations/Base.xcconfig (modified) (1 diff)
-
Tools/MiniBrowser/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Tools/TestWebKitAPI/Configurations/Base.xcconfig (modified) (1 diff)
-
Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig (modified) (5 diffs)
-
Tools/WebEditingTester/Configurations/Base.xcconfig (modified) (1 diff)
-
Tools/WebEditingTester/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Tools/WebKitTestRunner/Configurations/Base.xcconfig (modified) (1 diff)
-
Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
-
Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig (modified) (1 diff)
-
Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/PerformanceTests/ChangeLog
r263972 r264746 1 2020-07-22 Conrad Shultz <conrad_shultz@apple.com> 2 3 Update macOS Version macros 4 https://bugs.webkit.org/show_bug.cgi?id=214653 5 6 Reviewed by Tim Horton. 7 8 * MediaTime/Configurations/Base.xcconfig: 9 * MediaTime/Configurations/DebugRelease.xcconfig: 10 1 11 2020-07-06 Philippe Normand <pnormand@igalia.com> 2 12 -
trunk/PerformanceTests/MediaTime/Configurations/Base.xcconfig
r258478 r264746 86 86 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include icu $(HEADER_SEARCH_PATHS); 87 87 88 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)); 89 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300; 90 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400; 91 TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500; 92 TARGET_MAC_OS_X_VERSION_MAJOR_16 = 101600; 93 TARGET_MAC_OS_X_VERISON_MAJOR_17 = 101700; 88 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)); 89 TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300; 90 TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400; 91 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500; 92 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 93 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 94 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 94 95 95 96 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator; -
trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig
r257755 r264746 34 34 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15; 35 35 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16; 36 MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17; 36 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0; 37 MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0; 37 38 38 39 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; -
trunk/Source/JavaScriptCore/ChangeLog
r264743 r264746 1 2020-07-22 Conrad Shultz <conrad_shultz@apple.com> 2 3 Update macOS Version macros 4 https://bugs.webkit.org/show_bug.cgi?id=214653 5 6 Reviewed by Tim Horton. 7 8 * Configurations/Base.xcconfig: 9 * Configurations/DebugRelease.xcconfig: 10 * Configurations/Version.xcconfig: 11 * Configurations/WebKitTargetConditionals.xcconfig: 12 1 13 2020-07-22 Geoffrey Garen <ggaren@apple.com> 2 14 -
trunk/Source/JavaScriptCore/Configurations/Base.xcconfig
r263961 r264746 109 109 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 110 110 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 111 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;111 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 112 112 113 113 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9 -
trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig
r263364 r264746 29 29 ONLY_ACTIVE_ARCH = YES; 30 30 31 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 32 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 33 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 34 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 35 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 36 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 37 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 38 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 39 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 40 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 41 32 42 33 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 46 37 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16; 47 38 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0; 48 MACOSX_DEPLOYMENT_TARGET_macosx_1 01700 = 10.17;39 MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0; 49 40 50 41 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; -
trunk/Source/JavaScriptCore/Configurations/Version.xcconfig
r264636 r264746 40 40 SYSTEM_VERSION_PREFIX_macosx_101600 = 16; 41 41 SYSTEM_VERSION_PREFIX_macosx_110000 = 16; 42 SYSTEM_VERSION_PREFIX_macosx_1 01700 = 17;42 SYSTEM_VERSION_PREFIX_macosx_120000 = 17; 43 43 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8; 44 44 -
trunk/Source/JavaScriptCore/Configurations/WebKitTargetConditionals.xcconfig
r263364 r264746 66 66 WK_MACOS_BEFORE_1100_101500 = YES; 67 67 68 WK_MACOS_BEFORE_1 017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));69 WK_MACOS_BEFORE_1 017_101300 = YES;70 WK_MACOS_BEFORE_1 017_101400 = YES;71 WK_MACOS_BEFORE_1 017_101500 = YES;72 WK_MACOS_BEFORE_1 017_101600 = YES;73 WK_MACOS_BEFORE_1 017_110000 = YES;68 WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR)); 69 WK_MACOS_BEFORE_1200_101300 = YES; 70 WK_MACOS_BEFORE_1200_101400 = YES; 71 WK_MACOS_BEFORE_1200_101500 = YES; 72 WK_MACOS_BEFORE_1200_101600 = YES; 73 WK_MACOS_BEFORE_1200_110000 = YES; 74 74 75 75 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014)); … … 89 89 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014; 90 90 91 WK_MACOS_1014_1 017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));92 WK_MACOS_1014_1 017_ = $(WK_MACOS_1017);93 WK_MACOS_1014_1 017_YES = _MACOS_BEFORE_1014;91 WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014)); 92 WK_MACOS_1014_1200_ = $(WK_MACOS_1200); 93 WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014; 94 94 95 95 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015)); … … 105 105 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015; 106 106 107 WK_MACOS_1015_1 017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));108 WK_MACOS_1015_1 017_ = $(WK_MACOS_1017);109 WK_MACOS_1015_1 017_YES = _MACOS_BEFORE_1015;107 WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015)); 108 WK_MACOS_1015_1200_ = $(WK_MACOS_1200); 109 WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015; 110 110 111 111 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); … … 117 117 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016; 118 118 119 WK_MACOS_1016_1 017= $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));120 WK_MACOS_1016_1 017= _MACOS_SINCE_1016;121 WK_MACOS_1016_1 017_YES = _MACOS_BEFORE_1016;119 WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); 120 WK_MACOS_1016_1200 = _MACOS_SINCE_1016; 121 WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016; 122 122 123 123 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); … … 125 125 WK_MACOS_1100_YES = _MACOS_BEFORE_1100; 126 126 127 WK_MACOS_1100_1 017= $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));128 WK_MACOS_1100_1 017= _MACOS_SINCE_1100;129 WK_MACOS_1100_1 017_YES = _MACOS_BEFORE_1100;127 WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); 128 WK_MACOS_1100_1200 = _MACOS_SINCE_1100; 129 WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100; 130 130 131 WK_MACOS_1 017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));132 WK_MACOS_1 017_ = _MACOS_SINCE_1017;133 WK_MACOS_1 017_YES = _MACOS_BEFORE_1017;131 WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200)); 132 WK_MACOS_1200_ = _MACOS_SINCE_1200; 133 WK_MACOS_1200_YES = _MACOS_BEFORE_1200; 134 134 135 135 // iOS -
trunk/Source/ThirdParty/ANGLE/ChangeLog
r264562 r264746 1 2020-07-22 Conrad Shultz <conrad_shultz@apple.com> 2 3 Update macOS Version macros 4 https://bugs.webkit.org/show_bug.cgi?id=214653 5 6 Reviewed by Tim Horton. 7 8 * Configurations/Base.xcconfig: 9 * Configurations/DebugRelease.xcconfig: 10 * Configurations/Version.xcconfig: 11 * Configurations/WebKitTargetConditionals.xcconfig: 12 1 13 2020-07-17 Kenneth Russell <kbr@chromium.org> 2 14 -
trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
r263745 r264746 76 76 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 77 77 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 78 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;78 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 79 79 80 80 NORMAL_WEBCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; -
trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
r263364 r264746 6 6 ONLY_ACTIVE_ARCH = YES; 7 7 8 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 9 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 10 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 11 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 12 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 13 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 14 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 15 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 16 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 17 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 8 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 18 9 19 10 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 23 14 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16; 24 15 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0; 25 MACOSX_DEPLOYMENT_TARGET_macosx_1 01700 = 10.17;16 MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0; 26 17 27 18 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; -
trunk/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig
r264636 r264746 40 40 SYSTEM_VERSION_PREFIX_macosx_101600 = 16; 41 41 SYSTEM_VERSION_PREFIX_macosx_110000 = 16; 42 SYSTEM_VERSION_PREFIX_macosx_1 01700 = 17;42 SYSTEM_VERSION_PREFIX_macosx_120000 = 17; 43 43 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8; 44 44 -
trunk/Source/ThirdParty/ANGLE/Configurations/WebKitTargetConditionals.xcconfig
r263364 r264746 66 66 WK_MACOS_BEFORE_1100_101500 = YES; 67 67 68 WK_MACOS_BEFORE_1 017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));69 WK_MACOS_BEFORE_1 017_101300 = YES;70 WK_MACOS_BEFORE_1 017_101400 = YES;71 WK_MACOS_BEFORE_1 017_101500 = YES;72 WK_MACOS_BEFORE_1 017_101600 = YES;73 WK_MACOS_BEFORE_1 017_110000 = YES;68 WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR)); 69 WK_MACOS_BEFORE_1200_101300 = YES; 70 WK_MACOS_BEFORE_1200_101400 = YES; 71 WK_MACOS_BEFORE_1200_101500 = YES; 72 WK_MACOS_BEFORE_1200_101600 = YES; 73 WK_MACOS_BEFORE_1200_110000 = YES; 74 74 75 75 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014)); … … 89 89 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014; 90 90 91 WK_MACOS_1014_1 017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));92 WK_MACOS_1014_1 017_ = $(WK_MACOS_1017);93 WK_MACOS_1014_1 017_YES = _MACOS_BEFORE_1014;91 WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014)); 92 WK_MACOS_1014_1200_ = $(WK_MACOS_1200); 93 WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014; 94 94 95 95 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015)); … … 105 105 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015; 106 106 107 WK_MACOS_1015_1 017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));108 WK_MACOS_1015_1 017_ = $(WK_MACOS_1017);109 WK_MACOS_1015_1 017_YES = _MACOS_BEFORE_1015;107 WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015)); 108 WK_MACOS_1015_1200_ = $(WK_MACOS_1200); 109 WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015; 110 110 111 111 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); … … 117 117 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016; 118 118 119 WK_MACOS_1016_1 017= $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));120 WK_MACOS_1016_1 017= _MACOS_SINCE_1016;121 WK_MACOS_1016_1 017_YES = _MACOS_BEFORE_1016;119 WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); 120 WK_MACOS_1016_1200 = _MACOS_SINCE_1016; 121 WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016; 122 122 123 123 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); … … 125 125 WK_MACOS_1100_YES = _MACOS_BEFORE_1100; 126 126 127 WK_MACOS_1100_1 017= $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));128 WK_MACOS_1100_1 017= _MACOS_SINCE_1100;129 WK_MACOS_1100_1 017_YES = _MACOS_BEFORE_1100;127 WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); 128 WK_MACOS_1100_1200 = _MACOS_SINCE_1100; 129 WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100; 130 130 131 WK_MACOS_1 017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));132 WK_MACOS_1 017_ = _MACOS_SINCE_1017;133 WK_MACOS_1 017_YES = _MACOS_BEFORE_1017;131 WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200)); 132 WK_MACOS_1200_ = _MACOS_SINCE_1200; 133 WK_MACOS_1200_YES = _MACOS_BEFORE_1200; 134 134 135 135 // iOS -
trunk/Source/ThirdParty/ChangeLog
r263745 r264746 1 2020-07-22 Conrad Shultz <conrad_shultz@apple.com> 2 3 Update macOS Version macros 4 https://bugs.webkit.org/show_bug.cgi?id=214653 5 6 Reviewed by Tim Horton. 7 8 * gtest/xcode/Config/DebugProject.xcconfig: 9 * gtest/xcode/Config/ReleaseProject.xcconfig: 10 1 11 2020-06-30 Andy Estes <aestes@apple.com> 2 12 -
trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig
r263364 r264746 24 24 MACOSX_DEPLOYMENT_TARGET_101600 = 10.16; 25 25 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0; 26 MACOSX_DEPLOYMENT_TARGET_1 01700 = 10.17;26 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0; 27 27 28 28 // Dead code stripping off -
trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig
r263364 r264746 26 26 MACOSX_DEPLOYMENT_TARGET_101600 = 10.16; 27 27 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0; 28 MACOSX_DEPLOYMENT_TARGET_1 01700 = 10.17;28 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0; 29 29 30 30 // No symbols -
trunk/Source/ThirdParty/libwebrtc/ChangeLog
r264693 r264746 1 2020-07-22 Conrad Shultz <conrad_shultz@apple.com> 2 3 Update macOS Version macros 4 https://bugs.webkit.org/show_bug.cgi?id=214653 5 6 Reviewed by Tim Horton. 7 8 * Configurations/Base.xcconfig: 9 * Configurations/DebugRelease.xcconfig: 10 * Configurations/Version.xcconfig: 11 * Configurations/WebKitTargetConditionals.xcconfig: 12 1 13 2020-07-21 Jer Noble <jer.noble@apple.com> 2 14 -
trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
r263364 r264746 76 76 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 77 77 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 78 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;78 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 79 79 80 80 SDKROOT = macosx.internal; -
trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig
r264517 r264746 7 7 ONLY_ACTIVE_ARCH = YES; 8 8 9 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 10 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 11 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 12 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 13 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 14 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 15 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 16 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 17 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 18 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 9 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 19 10 20 11 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 24 15 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16; 25 16 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0; 26 MACOSX_DEPLOYMENT_TARGET_macosx_1 01700 = 10.17;17 MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0; 27 18 28 19 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; -
trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
r264636 r264746 40 40 SYSTEM_VERSION_PREFIX_macosx_101600 = 16; 41 41 SYSTEM_VERSION_PREFIX_macosx_110000 = 16; 42 SYSTEM_VERSION_PREFIX_macosx_1 01700 = 17;42 SYSTEM_VERSION_PREFIX_macosx_120000 = 17; 43 43 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8; 44 44 -
trunk/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig
r263364 r264746 66 66 WK_MACOS_BEFORE_1100_101500 = YES; 67 67 68 WK_MACOS_BEFORE_1 017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));69 WK_MACOS_BEFORE_1 017_101300 = YES;70 WK_MACOS_BEFORE_1 017_101400 = YES;71 WK_MACOS_BEFORE_1 017_101500 = YES;72 WK_MACOS_BEFORE_1 017_101600 = YES;73 WK_MACOS_BEFORE_1 017_110000 = YES;68 WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR)); 69 WK_MACOS_BEFORE_1200_101300 = YES; 70 WK_MACOS_BEFORE_1200_101400 = YES; 71 WK_MACOS_BEFORE_1200_101500 = YES; 72 WK_MACOS_BEFORE_1200_101600 = YES; 73 WK_MACOS_BEFORE_1200_110000 = YES; 74 74 75 75 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014)); … … 89 89 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014; 90 90 91 WK_MACOS_1014_1 017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));92 WK_MACOS_1014_1 017_ = $(WK_MACOS_1017);93 WK_MACOS_1014_1 017_YES = _MACOS_BEFORE_1014;91 WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014)); 92 WK_MACOS_1014_1200_ = $(WK_MACOS_1200); 93 WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014; 94 94 95 95 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015)); … … 105 105 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015; 106 106 107 WK_MACOS_1015_1 017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));108 WK_MACOS_1015_1 017_ = $(WK_MACOS_1017);109 WK_MACOS_1015_1 017_YES = _MACOS_BEFORE_1015;107 WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015)); 108 WK_MACOS_1015_1200_ = $(WK_MACOS_1200); 109 WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015; 110 110 111 111 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); … … 117 117 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016; 118 118 119 WK_MACOS_1016_1 017= $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));120 WK_MACOS_1016_1 017= _MACOS_SINCE_1016;121 WK_MACOS_1016_1 017_YES = _MACOS_BEFORE_1016;119 WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); 120 WK_MACOS_1016_1200 = _MACOS_SINCE_1016; 121 WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016; 122 122 123 123 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); … … 125 125 WK_MACOS_1100_YES = _MACOS_BEFORE_1100; 126 126 127 WK_MACOS_1100_1 017= $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));128 WK_MACOS_1100_1 017= _MACOS_SINCE_1100;129 WK_MACOS_1100_1 017_YES = _MACOS_BEFORE_1100;127 WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); 128 WK_MACOS_1100_1200 = _MACOS_SINCE_1100; 129 WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100; 130 130 131 WK_MACOS_1 017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));132 WK_MACOS_1 017_ = _MACOS_SINCE_1017;133 WK_MACOS_1 017_YES = _MACOS_BEFORE_1017;131 WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200)); 132 WK_MACOS_1200_ = _MACOS_SINCE_1200; 133 WK_MACOS_1200_YES = _MACOS_BEFORE_1200; 134 134 135 135 // iOS -
trunk/Source/WTF/ChangeLog
r264745 r264746 1 2020-07-22 Conrad Shultz <conrad_shultz@apple.com> 2 3 Update macOS Version macros 4 https://bugs.webkit.org/show_bug.cgi?id=214653 5 6 Reviewed by Tim Horton. 7 8 * Configurations/Base.xcconfig: 9 * Configurations/DebugRelease.xcconfig: 10 * wtf/PlatformHave.h: 11 1 12 2020-07-22 Keith Miller <keith_miller@apple.com> 2 13 -
trunk/Source/WTF/Configurations/Base.xcconfig
r263906 r264746 109 109 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 110 110 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 111 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;111 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 112 112 113 113 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator; -
trunk/Source/WTF/Configurations/DebugRelease.xcconfig
r263364 r264746 28 28 ONLY_ACTIVE_ARCH = YES; 29 29 30 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 31 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 32 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 33 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 34 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 35 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 36 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 37 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 38 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 39 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 30 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 40 31 41 32 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 45 36 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16; 46 37 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0; 47 MACOSX_DEPLOYMENT_TARGET_macosx_1 01700 = 10.17;38 MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0; 48 39 49 40 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; -
trunk/Source/WTF/wtf/PlatformHave.h
r264719 r264746 579 579 #endif 580 580 581 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1 01700)581 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) 582 582 #define HAVE_GCCONTROLLER_HID_DEVICE_CHECK 1 583 583 #endif -
trunk/Source/WebCore/ChangeLog
r264742 r264746 1 2020-07-22 Conrad Shultz <conrad_shultz@apple.com> 2 3 Update macOS Version macros 4 https://bugs.webkit.org/show_bug.cgi?id=214653 5 6 Reviewed by Tim Horton. 7 8 * Configurations/Base.xcconfig: 9 * Configurations/DebugRelease.xcconfig: 10 * Configurations/Version.xcconfig: 11 * Configurations/WebKitTargetConditionals.xcconfig: 12 1 13 2020-07-22 Jer Noble <jer.noble@apple.com> 2 14 -
trunk/Source/WebCore/Configurations/Base.xcconfig
r264357 r264746 99 99 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 100 100 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 101 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;101 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 102 102 103 103 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9 -
trunk/Source/WebCore/Configurations/DebugRelease.xcconfig
r263364 r264746 29 29 ONLY_ACTIVE_ARCH = YES; 30 30 31 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 32 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 33 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 34 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 35 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 36 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 37 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 38 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 39 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 40 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 41 32 42 33 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 46 37 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16; 47 38 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0; 48 MACOSX_DEPLOYMENT_TARGET_macosx_1 01700 = 10.17;39 MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0; 49 40 50 41 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; -
trunk/Source/WebCore/Configurations/Version.xcconfig
r264636 r264746 40 40 SYSTEM_VERSION_PREFIX_macosx_101600 = 16; 41 41 SYSTEM_VERSION_PREFIX_macosx_110000 = 16; 42 SYSTEM_VERSION_PREFIX_macosx_1 01700 = 17;42 SYSTEM_VERSION_PREFIX_macosx_120000 = 17; 43 43 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8; 44 44 -
trunk/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig
r263364 r264746 66 66 WK_MACOS_BEFORE_1100_101500 = YES; 67 67 68 WK_MACOS_BEFORE_1 017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));69 WK_MACOS_BEFORE_1 017_101300 = YES;70 WK_MACOS_BEFORE_1 017_101400 = YES;71 WK_MACOS_BEFORE_1 017_101500 = YES;72 WK_MACOS_BEFORE_1 017_101600 = YES;73 WK_MACOS_BEFORE_1 017_110000 = YES;68 WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR)); 69 WK_MACOS_BEFORE_1200_101300 = YES; 70 WK_MACOS_BEFORE_1200_101400 = YES; 71 WK_MACOS_BEFORE_1200_101500 = YES; 72 WK_MACOS_BEFORE_1200_101600 = YES; 73 WK_MACOS_BEFORE_1200_110000 = YES; 74 74 75 75 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014)); … … 89 89 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014; 90 90 91 WK_MACOS_1014_1 017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));92 WK_MACOS_1014_1 017_ = $(WK_MACOS_1017);93 WK_MACOS_1014_1 017_YES = _MACOS_BEFORE_1014;91 WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014)); 92 WK_MACOS_1014_1200_ = $(WK_MACOS_1200); 93 WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014; 94 94 95 95 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015)); … … 105 105 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015; 106 106 107 WK_MACOS_1015_1 017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));108 WK_MACOS_1015_1 017_ = $(WK_MACOS_1017);109 WK_MACOS_1015_1 017_YES = _MACOS_BEFORE_1015;107 WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015)); 108 WK_MACOS_1015_1200_ = $(WK_MACOS_1200); 109 WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015; 110 110 111 111 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); … … 117 117 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016; 118 118 119 WK_MACOS_1016_1 017= $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));120 WK_MACOS_1016_1 017= _MACOS_SINCE_1016;121 WK_MACOS_1016_1 017_YES = _MACOS_BEFORE_1016;119 WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); 120 WK_MACOS_1016_1200 = _MACOS_SINCE_1016; 121 WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016; 122 122 123 123 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); … … 125 125 WK_MACOS_1100_YES = _MACOS_BEFORE_1100; 126 126 127 WK_MACOS_1100_1 017= $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));128 WK_MACOS_1100_1 017= _MACOS_SINCE_1100;129 WK_MACOS_1100_1 017_YES = _MACOS_BEFORE_1100;127 WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); 128 WK_MACOS_1100_1200 = _MACOS_SINCE_1100; 129 WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100; 130 130 131 WK_MACOS_1 017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));132 WK_MACOS_1 017_ = _MACOS_SINCE_1017;133 WK_MACOS_1 017_YES = _MACOS_BEFORE_1017;131 WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200)); 132 WK_MACOS_1200_ = _MACOS_SINCE_1200; 133 WK_MACOS_1200_YES = _MACOS_BEFORE_1200; 134 134 135 135 // iOS -
trunk/Source/WebCore/PAL/ChangeLog
r264727 r264746 1 2020-07-22 Conrad Shultz <conrad_shultz@apple.com> 2 3 Update macOS Version macros 4 https://bugs.webkit.org/show_bug.cgi?id=214653 5 6 Reviewed by Tim Horton. 7 8 * Configurations/Base.xcconfig: 9 * Configurations/DebugRelease.xcconfig: 10 * Configurations/Version.xcconfig: 11 * Configurations/WebKitTargetConditionals.xcconfig: 12 1 13 2020-07-22 Chris Dumez <cdumez@apple.com> 2 14 -
trunk/Source/WebCore/PAL/Configurations/Base.xcconfig
r263906 r264746 97 97 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 98 98 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 99 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;99 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 100 100 101 101 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // iOS 9.3 => 9 -
trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig
r263364 r264746 29 29 ONLY_ACTIVE_ARCH = YES; 30 30 31 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 32 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 33 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 34 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 35 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 36 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 37 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 38 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 39 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 40 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 41 32 42 33 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 46 37 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16; 47 38 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0; 48 MACOSX_DEPLOYMENT_TARGET_macosx_1 01700 = 10.17;39 MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0; 49 40 50 41 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; -
trunk/Source/WebCore/PAL/Configurations/Version.xcconfig
r264636 r264746 41 41 SYSTEM_VERSION_PREFIX_macosx_101600 = 16; 42 42 SYSTEM_VERSION_PREFIX_macosx_110000 = 16; 43 SYSTEM_VERSION_PREFIX_macosx_1 01700 = 17;43 SYSTEM_VERSION_PREFIX_macosx_120000 = 17; 44 44 45 45 // The production build always uses the full version with a system version prefix. -
trunk/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig
r263364 r264746 66 66 WK_MACOS_BEFORE_1100_101500 = YES; 67 67 68 WK_MACOS_BEFORE_1 017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));69 WK_MACOS_BEFORE_1 017_101300 = YES;70 WK_MACOS_BEFORE_1 017_101400 = YES;71 WK_MACOS_BEFORE_1 017_101500 = YES;72 WK_MACOS_BEFORE_1 017_101600 = YES;73 WK_MACOS_BEFORE_1 017_110000 = YES;68 WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR)); 69 WK_MACOS_BEFORE_1200_101300 = YES; 70 WK_MACOS_BEFORE_1200_101400 = YES; 71 WK_MACOS_BEFORE_1200_101500 = YES; 72 WK_MACOS_BEFORE_1200_101600 = YES; 73 WK_MACOS_BEFORE_1200_110000 = YES; 74 74 75 75 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014)); … … 89 89 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014; 90 90 91 WK_MACOS_1014_1 017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));92 WK_MACOS_1014_1 017_ = $(WK_MACOS_1017);93 WK_MACOS_1014_1 017_YES = _MACOS_BEFORE_1014;91 WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014)); 92 WK_MACOS_1014_1200_ = $(WK_MACOS_1200); 93 WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014; 94 94 95 95 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015)); … … 105 105 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015; 106 106 107 WK_MACOS_1015_1 017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));108 WK_MACOS_1015_1 017_ = $(WK_MACOS_1017);109 WK_MACOS_1015_1 017_YES = _MACOS_BEFORE_1015;107 WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015)); 108 WK_MACOS_1015_1200_ = $(WK_MACOS_1200); 109 WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015; 110 110 111 111 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); … … 117 117 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016; 118 118 119 WK_MACOS_1016_1 017= $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));120 WK_MACOS_1016_1 017= _MACOS_SINCE_1016;121 WK_MACOS_1016_1 017_YES = _MACOS_BEFORE_1016;119 WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); 120 WK_MACOS_1016_1200 = _MACOS_SINCE_1016; 121 WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016; 122 122 123 123 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); … … 125 125 WK_MACOS_1100_YES = _MACOS_BEFORE_1100; 126 126 127 WK_MACOS_1100_1 017= $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));128 WK_MACOS_1100_1 017= _MACOS_SINCE_1100;129 WK_MACOS_1100_1 017_YES = _MACOS_BEFORE_1100;127 WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); 128 WK_MACOS_1100_1200 = _MACOS_SINCE_1100; 129 WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100; 130 130 131 WK_MACOS_1 017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));132 WK_MACOS_1 017_ = _MACOS_SINCE_1017;133 WK_MACOS_1 017_YES = _MACOS_BEFORE_1017;131 WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200)); 132 WK_MACOS_1200_ = _MACOS_SINCE_1200; 133 WK_MACOS_1200_YES = _MACOS_BEFORE_1200; 134 134 135 135 // iOS -
trunk/Source/WebInspectorUI/ChangeLog
r264717 r264746 1 2020-07-22 Conrad Shultz <conrad_shultz@apple.com> 2 3 Update macOS Version macros 4 https://bugs.webkit.org/show_bug.cgi?id=214653 5 6 Reviewed by Tim Horton. 7 8 * Configurations/Base.xcconfig: 9 * Configurations/DebugRelease.xcconfig: 10 * Configurations/Version.xcconfig: 11 * Configurations/WebKitTargetConditionals.xcconfig: 12 1 13 2020-07-22 Brian Burg <bburg@apple.com> 2 14 -
trunk/Source/WebInspectorUI/Configurations/Base.xcconfig
r263906 r264746 73 73 SUPPORTS_MACCATALYST = YES; 74 74 75 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)); 76 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300; 77 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400; 78 TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500; 79 TARGET_MAC_OS_X_VERSION_MAJOR_16 = 101600; 75 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)); 76 TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300; 77 TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400; 78 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500; 79 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 80 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 81 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 80 82 81 83 SDKROOT = macosx.internal; -
trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
r263364 r264746 6 6 ONLY_ACTIVE_ARCH = YES; 7 7 8 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 9 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 10 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 11 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 12 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 13 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 14 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 15 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 16 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 17 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 8 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 18 9 19 10 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 22 13 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15; 23 14 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16; 15 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0; 16 MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0; 24 17 25 18 ENGINEERING_BUILD = 1; -
trunk/Source/WebInspectorUI/Configurations/Version.xcconfig
r264636 r264746 14 14 SYSTEM_VERSION_PREFIX_macosx_101600 = 16; 15 15 SYSTEM_VERSION_PREFIX_macosx_110000 = 16; 16 SYSTEM_VERSION_PREFIX_macosx_1 01700 = 17;16 SYSTEM_VERSION_PREFIX_macosx_120000 = 17; 17 17 18 18 BUNDLE_VERSION = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION); -
trunk/Source/WebInspectorUI/Configurations/WebKitTargetConditionals.xcconfig
r263364 r264746 66 66 WK_MACOS_BEFORE_1100_101500 = YES; 67 67 68 WK_MACOS_BEFORE_1 017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));69 WK_MACOS_BEFORE_1 017_101300 = YES;70 WK_MACOS_BEFORE_1 017_101400 = YES;71 WK_MACOS_BEFORE_1 017_101500 = YES;72 WK_MACOS_BEFORE_1 017_101600 = YES;73 WK_MACOS_BEFORE_1 017_110000 = YES;68 WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR)); 69 WK_MACOS_BEFORE_1200_101300 = YES; 70 WK_MACOS_BEFORE_1200_101400 = YES; 71 WK_MACOS_BEFORE_1200_101500 = YES; 72 WK_MACOS_BEFORE_1200_101600 = YES; 73 WK_MACOS_BEFORE_1200_110000 = YES; 74 74 75 75 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014)); … … 89 89 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014; 90 90 91 WK_MACOS_1014_1 017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));92 WK_MACOS_1014_1 017_ = $(WK_MACOS_1017);93 WK_MACOS_1014_1 017_YES = _MACOS_BEFORE_1014;91 WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014)); 92 WK_MACOS_1014_1200_ = $(WK_MACOS_1200); 93 WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014; 94 94 95 95 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015)); … … 105 105 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015; 106 106 107 WK_MACOS_1015_1 017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));108 WK_MACOS_1015_1 017_ = $(WK_MACOS_1017);109 WK_MACOS_1015_1 017_YES = _MACOS_BEFORE_1015;107 WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015)); 108 WK_MACOS_1015_1200_ = $(WK_MACOS_1200); 109 WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015; 110 110 111 111 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); … … 117 117 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016; 118 118 119 WK_MACOS_1016_1 017= $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));120 WK_MACOS_1016_1 017= _MACOS_SINCE_1016;121 WK_MACOS_1016_1 017_YES = _MACOS_BEFORE_1016;119 WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); 120 WK_MACOS_1016_1200 = _MACOS_SINCE_1016; 121 WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016; 122 122 123 123 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); … … 125 125 WK_MACOS_1100_YES = _MACOS_BEFORE_1100; 126 126 127 WK_MACOS_1100_1 017= $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));128 WK_MACOS_1100_1 017= _MACOS_SINCE_1100;129 WK_MACOS_1100_1 017_YES = _MACOS_BEFORE_1100;127 WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); 128 WK_MACOS_1100_1200 = _MACOS_SINCE_1100; 129 WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100; 130 130 131 WK_MACOS_1 017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));132 WK_MACOS_1 017_ = _MACOS_SINCE_1017;133 WK_MACOS_1 017_YES = _MACOS_BEFORE_1017;131 WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200)); 132 WK_MACOS_1200_ = _MACOS_SINCE_1200; 133 WK_MACOS_1200_YES = _MACOS_BEFORE_1200; 134 134 135 135 // iOS -
trunk/Source/WebKit/ChangeLog
r264740 r264746 1 2020-07-22 Conrad Shultz <conrad_shultz@apple.com> 2 3 Update macOS Version macros 4 https://bugs.webkit.org/show_bug.cgi?id=214653 5 6 Reviewed by Tim Horton. 7 8 * Configurations/Base.xcconfig: 9 * Configurations/DebugRelease.xcconfig: 10 * Configurations/Version.xcconfig: 11 * Configurations/WebKitTargetConditionals.xcconfig: 12 1 13 2020-07-22 Fujii Hironori <Hironori.Fujii@sony.com> 2 14 -
trunk/Source/WebKit/Configurations/Base.xcconfig
r263906 r264746 95 95 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 96 96 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 97 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;97 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 98 98 99 99 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9 -
trunk/Source/WebKit/Configurations/DebugRelease.xcconfig
r263364 r264746 29 29 ONLY_ACTIVE_ARCH = YES; 30 30 31 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 32 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 33 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 34 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 35 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 36 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 37 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 38 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 39 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 40 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 41 32 42 33 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 46 37 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16; 47 38 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0; 48 MACOSX_DEPLOYMENT_TARGET_macosx_1 01700 = 10.17;39 MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0; 49 40 50 41 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; -
trunk/Source/WebKit/Configurations/Version.xcconfig
r264636 r264746 40 40 SYSTEM_VERSION_PREFIX_macosx_101600 = 16; 41 41 SYSTEM_VERSION_PREFIX_macosx_110000 = 16; 42 SYSTEM_VERSION_PREFIX_macosx_1 01700 = 17;42 SYSTEM_VERSION_PREFIX_macosx_120000 = 17; 43 43 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8; 44 44 -
trunk/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig
r263364 r264746 66 66 WK_MACOS_BEFORE_1100_101500 = YES; 67 67 68 WK_MACOS_BEFORE_1 017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));69 WK_MACOS_BEFORE_1 017_101300 = YES;70 WK_MACOS_BEFORE_1 017_101400 = YES;71 WK_MACOS_BEFORE_1 017_101500 = YES;72 WK_MACOS_BEFORE_1 017_101600 = YES;73 WK_MACOS_BEFORE_1 017_110000 = YES;68 WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR)); 69 WK_MACOS_BEFORE_1200_101300 = YES; 70 WK_MACOS_BEFORE_1200_101400 = YES; 71 WK_MACOS_BEFORE_1200_101500 = YES; 72 WK_MACOS_BEFORE_1200_101600 = YES; 73 WK_MACOS_BEFORE_1200_110000 = YES; 74 74 75 75 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014)); … … 89 89 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014; 90 90 91 WK_MACOS_1014_1 017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));92 WK_MACOS_1014_1 017_ = $(WK_MACOS_1017);93 WK_MACOS_1014_1 017_YES = _MACOS_BEFORE_1014;91 WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014)); 92 WK_MACOS_1014_1200_ = $(WK_MACOS_1200); 93 WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014; 94 94 95 95 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015)); … … 105 105 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015; 106 106 107 WK_MACOS_1015_1 017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));108 WK_MACOS_1015_1 017_ = $(WK_MACOS_1017);109 WK_MACOS_1015_1 017_YES = _MACOS_BEFORE_1015;107 WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015)); 108 WK_MACOS_1015_1200_ = $(WK_MACOS_1200); 109 WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015; 110 110 111 111 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); … … 117 117 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016; 118 118 119 WK_MACOS_1016_1 017= $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));120 WK_MACOS_1016_1 017= _MACOS_SINCE_1016;121 WK_MACOS_1016_1 017_YES = _MACOS_BEFORE_1016;119 WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); 120 WK_MACOS_1016_1200 = _MACOS_SINCE_1016; 121 WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016; 122 122 123 123 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); … … 125 125 WK_MACOS_1100_YES = _MACOS_BEFORE_1100; 126 126 127 WK_MACOS_1100_1 017= $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));128 WK_MACOS_1100_1 017= _MACOS_SINCE_1100;129 WK_MACOS_1100_1 017_YES = _MACOS_BEFORE_1100;127 WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); 128 WK_MACOS_1100_1200 = _MACOS_SINCE_1100; 129 WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100; 130 130 131 WK_MACOS_1 017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));132 WK_MACOS_1 017_ = _MACOS_SINCE_1017;133 WK_MACOS_1 017_YES = _MACOS_BEFORE_1017;131 WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200)); 132 WK_MACOS_1200_ = _MACOS_SINCE_1200; 133 WK_MACOS_1200_YES = _MACOS_BEFORE_1200; 134 134 135 135 // iOS -
trunk/Source/WebKitLegacy/mac/ChangeLog
r264692 r264746 1 2020-07-22 Conrad Shultz <conrad_shultz@apple.com> 2 3 Update macOS Version macros 4 https://bugs.webkit.org/show_bug.cgi?id=214653 5 6 Reviewed by Tim Horton. 7 8 * Configurations/Base.xcconfig: 9 * Configurations/DebugRelease.xcconfig: 10 * Configurations/Version.xcconfig: 11 * Configurations/WebKitTargetConditionals.xcconfig: 12 1 13 2020-07-19 Darin Adler <darin@apple.com> 2 14 -
trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig
r263906 r264746 97 97 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 98 98 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 99 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;99 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 100 100 101 101 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9 -
trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig
r263364 r264746 29 29 ONLY_ACTIVE_ARCH = YES; 30 30 31 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 32 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 33 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 34 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 35 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 36 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 37 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 38 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 39 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 40 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 41 32 42 33 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 46 37 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16; 47 38 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0; 48 MACOSX_DEPLOYMENT_TARGET_macosx_1 01700 = 10.17;39 MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0; 49 40 50 41 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; -
trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig
r264636 r264746 40 40 SYSTEM_VERSION_PREFIX_macosx_101600 = 16; 41 41 SYSTEM_VERSION_PREFIX_macosx_110000 = 16; 42 SYSTEM_VERSION_PREFIX_macosx_1 01700 = 17;42 SYSTEM_VERSION_PREFIX_macosx_120000 = 17; 43 43 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8; 44 44 -
trunk/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig
r263364 r264746 66 66 WK_MACOS_BEFORE_1100_101500 = YES; 67 67 68 WK_MACOS_BEFORE_1 017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));69 WK_MACOS_BEFORE_1 017_101300 = YES;70 WK_MACOS_BEFORE_1 017_101400 = YES;71 WK_MACOS_BEFORE_1 017_101500 = YES;72 WK_MACOS_BEFORE_1 017_101600 = YES;73 WK_MACOS_BEFORE_1 017_110000 = YES;68 WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR)); 69 WK_MACOS_BEFORE_1200_101300 = YES; 70 WK_MACOS_BEFORE_1200_101400 = YES; 71 WK_MACOS_BEFORE_1200_101500 = YES; 72 WK_MACOS_BEFORE_1200_101600 = YES; 73 WK_MACOS_BEFORE_1200_110000 = YES; 74 74 75 75 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014)); … … 89 89 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014; 90 90 91 WK_MACOS_1014_1 017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));92 WK_MACOS_1014_1 017_ = $(WK_MACOS_1017);93 WK_MACOS_1014_1 017_YES = _MACOS_BEFORE_1014;91 WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014)); 92 WK_MACOS_1014_1200_ = $(WK_MACOS_1200); 93 WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014; 94 94 95 95 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015)); … … 105 105 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015; 106 106 107 WK_MACOS_1015_1 017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));108 WK_MACOS_1015_1 017_ = $(WK_MACOS_1017);109 WK_MACOS_1015_1 017_YES = _MACOS_BEFORE_1015;107 WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015)); 108 WK_MACOS_1015_1200_ = $(WK_MACOS_1200); 109 WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015; 110 110 111 111 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); … … 117 117 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016; 118 118 119 WK_MACOS_1016_1 017= $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));120 WK_MACOS_1016_1 017= _MACOS_SINCE_1016;121 WK_MACOS_1016_1 017_YES = _MACOS_BEFORE_1016;119 WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); 120 WK_MACOS_1016_1200 = _MACOS_SINCE_1016; 121 WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016; 122 122 123 123 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); … … 125 125 WK_MACOS_1100_YES = _MACOS_BEFORE_1100; 126 126 127 WK_MACOS_1100_1 017= $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));128 WK_MACOS_1100_1 017= _MACOS_SINCE_1100;129 WK_MACOS_1100_1 017_YES = _MACOS_BEFORE_1100;127 WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); 128 WK_MACOS_1100_1200 = _MACOS_SINCE_1100; 129 WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100; 130 130 131 WK_MACOS_1 017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));132 WK_MACOS_1 017_ = _MACOS_SINCE_1017;133 WK_MACOS_1 017_YES = _MACOS_BEFORE_1017;131 WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200)); 132 WK_MACOS_1200_ = _MACOS_SINCE_1200; 133 WK_MACOS_1200_YES = _MACOS_BEFORE_1200; 134 134 135 135 // iOS -
trunk/Source/bmalloc/ChangeLog
r263906 r264746 1 2020-07-22 Conrad Shultz <conrad_shultz@apple.com> 2 3 Update macOS Version macros 4 https://bugs.webkit.org/show_bug.cgi?id=214653 5 6 Reviewed by Tim Horton. 7 8 * Configurations/Base.xcconfig: 9 * Configurations/DebugRelease.xcconfig: 10 1 11 2020-07-03 Sam Weinig <weinig@apple.com> 2 12 -
trunk/Source/bmalloc/Configurations/Base.xcconfig
r263906 r264746 103 103 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 104 104 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 105 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;105 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 106 106 107 107 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator; -
trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig
r263364 r264746 28 28 ONLY_ACTIVE_ARCH = YES; 29 29 30 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 31 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 32 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 33 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 34 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 35 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 36 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 37 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 38 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 39 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 30 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 40 31 41 32 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 45 36 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16; 46 37 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0; 47 MACOSX_DEPLOYMENT_TARGET_macosx_1 01700 = 10.17;38 MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0; 48 39 49 40 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; -
trunk/Tools/ChangeLog
r264729 r264746 1 2020-07-22 Conrad Shultz <conrad_shultz@apple.com> 2 3 Update macOS Version macros 4 https://bugs.webkit.org/show_bug.cgi?id=214653 5 6 Reviewed by Tim Horton. 7 8 * ContentExtensionTester/Configurations/Base.xcconfig: 9 * ContentExtensionTester/Configurations/DebugRelease.xcconfig: 10 * DumpRenderTree/mac/Configurations/Base.xcconfig: 11 * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig: 12 * ImageDiff/cg/Configurations/Base.xcconfig: 13 * ImageDiff/cg/Configurations/DebugRelease.xcconfig: 14 * MiniBrowser/Configurations/Base.xcconfig: 15 * MiniBrowser/Configurations/DebugRelease.xcconfig: 16 * TestWebKitAPI/Configurations/Base.xcconfig: 17 * TestWebKitAPI/Configurations/DebugRelease.xcconfig: 18 * TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig: 19 * WebEditingTester/Configurations/Base.xcconfig: 20 * WebEditingTester/Configurations/DebugRelease.xcconfig: 21 * WebKitTestRunner/Configurations/Base.xcconfig: 22 * WebKitTestRunner/Configurations/DebugRelease.xcconfig: 23 * lldb/lldbWebKitTester/Configurations/Base.xcconfig: 24 * lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig: 25 1 26 2020-07-22 Wenson Hsieh <wenson_hsieh@apple.com> 2 27 -
trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig
r263364 r264746 74 74 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 75 75 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 76 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;76 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 77 77 78 78 // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants. -
trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig
r263364 r264746 26 26 ONLY_ACTIVE_ARCH = YES; 27 27 28 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 29 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 30 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 31 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 32 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 33 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 34 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 35 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 36 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 37 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 28 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 38 29 39 30 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 43 34 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16; 44 35 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0; 45 MACOSX_DEPLOYMENT_TARGET_macosx_1 01700 = 10.17;36 MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0; 46 37 47 38 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; -
trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
r263745 r264746 96 96 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 97 97 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 98 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;98 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 99 99 100 100 SDKROOT = macosx.internal; -
trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
r263364 r264746 29 29 ONLY_ACTIVE_ARCH = YES; 30 30 31 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 32 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 33 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 34 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 35 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 36 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 37 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 38 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 39 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 40 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 41 32 42 33 MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 45 36 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15; 46 37 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16; 47 MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17; 38 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0; 39 MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0; 48 40 49 41 CODE_SIGN_IDENTITY[sdk=macosx*] = $(CODE_SIGN_IDENTITY_$(USE_INTERNAL_SDK)); -
trunk/Tools/ImageDiff/cg/Configurations/Base.xcconfig
r264680 r264746 76 76 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 77 77 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 78 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;78 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 79 79 80 80 SDKROOT = macosx.internal; -
trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig
r263364 r264746 28 28 ONLY_ACTIVE_ARCH = YES; 29 29 30 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 31 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 32 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 33 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 34 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 35 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 36 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 37 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 38 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 39 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 30 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 40 31 41 32 MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 44 35 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15; 45 36 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16; 46 MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17; 37 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0; 38 MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0; 47 39 48 40 SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK)); -
trunk/Tools/MiniBrowser/Configurations/Base.xcconfig
r263745 r264746 80 80 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 81 81 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 82 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;82 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 83 83 84 84 SDKROOT = macosx.internal; -
trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
r263364 r264746 29 29 ONLY_ACTIVE_ARCH = YES; 30 30 31 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 32 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 33 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 34 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 35 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 36 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 37 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 38 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 39 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 40 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 41 32 42 33 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 46 37 MACOSX_DEPLOYMENT_TARGET_101600 = 10.16; 47 38 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0; 48 MACOSX_DEPLOYMENT_TARGET_1 01700 = 10.17;39 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0; 49 40 50 41 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; -
trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig
r263961 r264746 90 90 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 91 91 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 92 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;92 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 93 93 94 94 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9 -
trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
r263364 r264746 29 29 ONLY_ACTIVE_ARCH = YES; 30 30 31 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 32 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 33 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 34 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 35 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 36 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 37 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 38 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 39 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 40 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 41 32 42 33 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 46 37 MACOSX_DEPLOYMENT_TARGET_101600 = 10.16; 47 38 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0; 48 MACOSX_DEPLOYMENT_TARGET_1 01700 = 10.17;39 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0; 49 40 50 41 WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR); -
trunk/Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig
r263364 r264746 66 66 WK_MACOS_BEFORE_1100_101500 = YES; 67 67 68 WK_MACOS_BEFORE_1 017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));69 WK_MACOS_BEFORE_1 017_101300 = YES;70 WK_MACOS_BEFORE_1 017_101400 = YES;71 WK_MACOS_BEFORE_1 017_101500 = YES;72 WK_MACOS_BEFORE_1 017_101600 = YES;73 WK_MACOS_BEFORE_1 017_110000 = YES;68 WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR)); 69 WK_MACOS_BEFORE_1200_101300 = YES; 70 WK_MACOS_BEFORE_1200_101400 = YES; 71 WK_MACOS_BEFORE_1200_101500 = YES; 72 WK_MACOS_BEFORE_1200_101600 = YES; 73 WK_MACOS_BEFORE_1200_110000 = YES; 74 74 75 75 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014)); … … 89 89 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014; 90 90 91 WK_MACOS_1014_1 017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));92 WK_MACOS_1014_1 017_ = $(WK_MACOS_1017);93 WK_MACOS_1014_1 017_YES = _MACOS_BEFORE_1014;91 WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014)); 92 WK_MACOS_1014_1200_ = $(WK_MACOS_1200); 93 WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014; 94 94 95 95 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015)); … … 105 105 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015; 106 106 107 WK_MACOS_1015_1 017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));108 WK_MACOS_1015_1 017_ = $(WK_MACOS_1017);109 WK_MACOS_1015_1 017_YES = _MACOS_BEFORE_1015;107 WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015)); 108 WK_MACOS_1015_1200_ = $(WK_MACOS_1200); 109 WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015; 110 110 111 111 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); … … 117 117 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016; 118 118 119 WK_MACOS_1016_1 017= $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));120 WK_MACOS_1016_1 017= _MACOS_SINCE_1016;121 WK_MACOS_1016_1 017_YES = _MACOS_BEFORE_1016;119 WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016)); 120 WK_MACOS_1016_1200 = _MACOS_SINCE_1016; 121 WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016; 122 122 123 123 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); … … 125 125 WK_MACOS_1100_YES = _MACOS_BEFORE_1100; 126 126 127 WK_MACOS_1100_1 017= $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));128 WK_MACOS_1100_1 017= _MACOS_SINCE_1100;129 WK_MACOS_1100_1 017_YES = _MACOS_BEFORE_1100;127 WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100)); 128 WK_MACOS_1100_1200 = _MACOS_SINCE_1100; 129 WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100; 130 130 131 WK_MACOS_1 017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));132 WK_MACOS_1 017_ = _MACOS_SINCE_1017;133 WK_MACOS_1 017_YES = _MACOS_BEFORE_1017;131 WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200)); 132 WK_MACOS_1200_ = _MACOS_SINCE_1200; 133 WK_MACOS_1200_YES = _MACOS_BEFORE_1200; 134 134 135 135 // iOS -
trunk/Tools/WebEditingTester/Configurations/Base.xcconfig
r263364 r264746 62 62 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 63 63 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 64 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;64 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 65 65 66 66 SDKROOT = macosx.internal; -
trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig
r263364 r264746 28 28 ONLY_ACTIVE_ARCH = YES; 29 29 30 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 31 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 32 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 33 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 34 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 35 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 36 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 37 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 38 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 39 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 30 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 40 31 41 32 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 45 36 MACOSX_DEPLOYMENT_TARGET_101600 = 10.16; 46 37 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0; 47 MACOSX_DEPLOYMENT_TARGET_1 01700 = 10.17;38 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0; 48 39 49 40 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; -
trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig
r263745 r264746 84 84 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 85 85 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 86 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;86 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 87 87 88 88 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9 -
trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
r263364 r264746 29 29 ONLY_ACTIVE_ARCH = YES; 30 30 31 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 32 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 33 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 34 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 35 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 36 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 37 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 38 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 39 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 40 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 31 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 41 32 42 33 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 46 37 MACOSX_DEPLOYMENT_TARGET_101600 = 10.16; 47 38 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0; 48 MACOSX_DEPLOYMENT_TARGET_1 01700 = 10.17;39 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0; 49 40 50 41 SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK)); -
trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig
r263364 r264746 93 93 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600; 94 94 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000; 95 TARGET_MAC_OS_X_VERSION_MAJOR_1 0_17 = 101700;95 TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000; 96 96 97 97 SUPPORTED_PLATFORMS = macosx; -
trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig
r263364 r264746 26 26 ONLY_ACTIVE_ARCH = YES; 27 27 28 // FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR). 29 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR)); 30 TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR); 31 TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR); 32 TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR); 33 TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR); 34 TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16); 35 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR); 36 TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0); 37 TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR); 28 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR); 38 29 39 30 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR)); … … 43 34 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16; 44 35 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0; 45 MACOSX_DEPLOYMENT_TARGET_macosx_1 01700 = 10.17;36 MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0; 46 37 47 38 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
Note:
See TracChangeset
for help on using the changeset viewer.
