Title: [290145] trunk/Source/ThirdParty/ANGLE
Revision
290145
Author
sbar...@apple.com
Date
2022-02-18 10:59:32 -0800 (Fri, 18 Feb 2022)

Log Message

Remove ANGLE-static.xcconfig
https://bugs.webkit.org/show_bug.cgi?id=236827

Reviewed by Dean Jackson.

It was unused.

* ANGLE.xcodeproj/project.pbxproj:
* Configurations/ANGLE-static.xcconfig: Removed.
* Configurations/Base.xcconfig:

Modified Paths

Removed Paths

Diff

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (290144 => 290145)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj	2022-02-18 18:54:31 UTC (rev 290144)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj	2022-02-18 18:59:32 UTC (rev 290145)
@@ -1003,7 +1003,6 @@
 		31B1571F236B7FAE00CAA4FD /* SystemInfo_ios.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemInfo_ios.cpp; sourceTree = "<group>"; };
 		31B15721236B803300CAA4FD /* SystemInfo_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemInfo_internal.h; sourceTree = "<group>"; };
 		31CDFDEE24917F8900486F27 /* ANGLE-dynamic.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "ANGLE-dynamic.xcconfig"; sourceTree = "<group>"; };
-		31CDFDEF24917F8900486F27 /* ANGLE-static.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "ANGLE-static.xcconfig"; sourceTree = "<group>"; };
 		31CDFDF42491819E00486F27 /* libANGLE-shared.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libANGLE-shared.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5C1BAA961DFB60FF002906BB /* gl3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl3.h; path = include/GLES3/gl3.h; sourceTree = "<group>"; };
 		5C1BAA971DFB60FF002906BB /* gl3platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl3platform.h; path = include/GLES3/gl3platform.h; sourceTree = "<group>"; };
@@ -2693,7 +2692,6 @@
 			isa = PBXGroup;
 			children = (
 				31CDFDEE24917F8900486F27 /* ANGLE-dynamic.xcconfig */,
-				31CDFDEF24917F8900486F27 /* ANGLE-static.xcconfig */,
 				FFE0D91526A0B4E80071ADAE /* AngleMetalLib.xcconfig */,
 				5D7C59C61208C68B001C873E /* Base.xcconfig */,
 				5D7C59C71208C68B001C873E /* DebugRelease.xcconfig */,

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (290144 => 290145)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2022-02-18 18:54:31 UTC (rev 290144)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2022-02-18 18:59:32 UTC (rev 290145)
@@ -1,3 +1,16 @@
+2022-02-18  Saam Barati  <sbar...@apple.com>
+
+        Remove ANGLE-static.xcconfig
+        https://bugs.webkit.org/show_bug.cgi?id=236827
+
+        Reviewed by Dean Jackson.
+
+        It was unused.
+
+        * ANGLE.xcodeproj/project.pbxproj:
+        * Configurations/ANGLE-static.xcconfig: Removed.
+        * Configurations/Base.xcconfig:
+
 2022-02-18  Adrian Perez de Castro  <ape...@igalia.com>
 
         [CMake] Cannot find OpenGL when system provides opengl.pc instead of gl.pc

Deleted: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-static.xcconfig (290144 => 290145)


--- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-static.xcconfig	2022-02-18 18:54:31 UTC (rev 290144)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-static.xcconfig	2022-02-18 18:59:32 UTC (rev 290145)
@@ -1,31 +0,0 @@
-#include "Version.xcconfig"
-#include "WebKitTargetConditionals.xcconfig"
-
-PRODUCT_NAME = ANGLE;
-EXECUTABLE_PREFIX = lib;
-
-ANGLE_OTHER_LDFLAGS = -allowable_client WebCore -allowable_client WebCoreTestSupport $(ANGLE_OTHER_LDFLAGS_$(WK_PLATFORM_NAME));
-ANGLE_OTHER_LDFLAGS_iphoneos = -framework IOSurface -lz;
-ANGLE_OTHER_LDFLAGS_iphonesimulator = $(ANGLE_OTHER_LDFLAGS_iphoneos);
-ANGLE_OTHER_LDFLAGS_watchos = $(ANGLE_OTHER_LDFLAGS_iphoneos);
-ANGLE_OTHER_LDFLAGS_watchsimulator = $(ANGLE_OTHER_LDFLAGS_iphonesimulator);
-ANGLE_OTHER_LDFLAGS_appletvos = $(ANGLE_OTHER_LDFLAGS_iphoneos);
-ANGLE_OTHER_LDFLAGS_appletvsimulator = $(ANGLE_OTHER_LDFLAGS_iphonesimulator);
-ANGLE_OTHER_LDFLAGS_maccatalyst = -framework IOKit -framework IOSurface -lz;
-ANGLE_OTHER_LDFLAGS_macosx = -framework IOKit -framework IOSurface -lz;
-
-INSTALL_PATH = $(ANGLE_INSTALL_PATH_PREFIX)/usr/local/lib;
-
-HEADER_SEARCH_PATHS = include src src/common/third_party/numerics third_party/base src/common/third_party/base third_party/zlib/google;
-
-ANGLE_HEADERS_FOLDER_PATH = /usr/local/include/ANGLE;
-
-PUBLIC_HEADERS_FOLDER_PATH = $(ANGLE_INSTALL_PATH_PREFIX)/usr/local/include/ANGLE;
-
-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) LIBGLESV2_IMPLEMENTATION LIBANGLE_IMPLEMENTATION ANGLE_CAPTURE_ENABLED=0 ANGLE_ENABLE_OPENGL ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL GL_SILENCE_DEPRECATION GLES_SILENCE_DEPRECATION ANGLE_ENABLE_METAL ANGLE_ENABLE_APPLE_WORKAROUNDS ANGLE_METAL_XCODE_BUILDS_SHADERS ANGLE_ENABLE_METAL_OWNERSHIP_IDENTITY;
-
-GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*]= $(DEBUG_DEFINES) LIBGLESV2_IMPLEMENTATION LIBANGLE_IMPLEMENTATION ANGLE_CAPTURE_ENABLED=0 ANGLE_ENABLE_OPENGL ANGLE_ENABLE_GLSL ANGLE_ENABLE_ESSL GL_SILENCE_DEPRECATION GLES_SILENCE_DEPRECATION ANGLE_ENABLE_METAL ANGLE_METAL_XCODE_BUILDS_SHADERS ANGLE_ENABLE_APPLE_WORKAROUNDS ANGLE_ENABLE_OPENGL_DESKTOP ANGLE_ENABLE_METAL_OWNERSHIP_IDENTITY
-
-INSTALLHDRS_SCRIPT_PHASE = YES;
-USE_HEADERMAP = NO;
-APPLY_RULES_IN_COPY_HEADERS = $(WK_USE_NEW_BUILD_SYSTEM);

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (290144 => 290145)


--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2022-02-18 18:54:31 UTC (rev 290144)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2022-02-18 18:59:32 UTC (rev 290145)
@@ -83,7 +83,7 @@
 GCC_OPTIMIZATION_LEVEL = s;
 GCC_OPTIMIZATION_LEVEL[config=Debug] = 0;
 
-// This is overridden in ANGLE-dynamic.xcconfig, but is set to NO for ANGLE-static.xcconfig to have symbols.
+// This is overridden in ANGLE-dynamic.xcconfig.
 STRIP_INSTALLED_PRODUCT = NO;
 
 NORMAL_WEBCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to