Title: [276335] branches/safari-612.1.11-branch/Source/ThirdParty/ANGLE
- Revision
- 276335
- Author
- [email protected]
- Date
- 2021-04-20 17:22:30 -0700 (Tue, 20 Apr 2021)
Log Message
Cherry-pick r276286. rdar://problem/76641662
Build ANGLE dylib into WK_OVERRIDE_FRAMEWORKS_DIR in builds that use it
https://bugs.webkit.org/show_bug.cgi?id=224785
<rdar://76641662>
Patch by Alex Christensen <[email protected]> on 2021-04-19
Reviewed by Alexey Proskuryakov.
* Configurations/ANGLE-dynamic.xcconfig:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276286 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.11-branch/Source/ThirdParty/ANGLE/ChangeLog (276334 => 276335)
--- branches/safari-612.1.11-branch/Source/ThirdParty/ANGLE/ChangeLog 2021-04-21 00:20:14 UTC (rev 276334)
+++ branches/safari-612.1.11-branch/Source/ThirdParty/ANGLE/ChangeLog 2021-04-21 00:22:30 UTC (rev 276335)
@@ -1,3 +1,28 @@
+2021-04-20 Alan Coon <[email protected]>
+
+ Cherry-pick r276286. rdar://problem/76641662
+
+ Build ANGLE dylib into WK_OVERRIDE_FRAMEWORKS_DIR in builds that use it
+ https://bugs.webkit.org/show_bug.cgi?id=224785
+ <rdar://76641662>
+
+ Patch by Alex Christensen <[email protected]> on 2021-04-19
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276286 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-04-19 Alex Christensen <[email protected]>
+
+ Build ANGLE dylib into WK_OVERRIDE_FRAMEWORKS_DIR in builds that use it
+ https://bugs.webkit.org/show_bug.cgi?id=224785
+ <rdar://76641662>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
2021-04-08 Kyle Piddington <[email protected]>
[Metal-ANGLE] Support GPU power preferences, select low-power GPU by default.
Modified: branches/safari-612.1.11-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (276334 => 276335)
--- branches/safari-612.1.11-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-04-21 00:20:14 UTC (rev 276334)
+++ branches/safari-612.1.11-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2021-04-21 00:22:30 UTC (rev 276335)
@@ -18,7 +18,9 @@
INSTALL_PATH = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
+INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
+INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/WebCore.framework/Versions/A/Frameworks;
DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes