Build fixes for MacCatalyst

WebKit needs these preprocessor directives because they can't selectively compile files per platform. Bug: angleproject:4613 Change-Id: Ie549cd734c74b50666f3d7e142b885bc78077fc2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2255701 Commit-Queue: James Darpinian <jdarpinian@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org> Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>

Build fixes for MacCatalyst
3c8f582b · James Darpinian · Commit Bot · 916ad955 · 3c8f582b · 3c8f582b
Commit 3c8f582b authored Jun 19, 2020 by James Darpinian Committed by Commit Bot Oct 19, 2020
4 changed files
--- a/src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp
+++ b/src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp
@@ -8,7 +8,7 @@

 #import "common/platform.h"

-#if defined(ANGLE_PLATFORM_IOS)
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)

 #    include "libANGLE/renderer/gl/eagl/DeviceEAGL.h"

@@ -56,4 +56,4 @@ void DeviceEAGL::generateExtensions(egl::DeviceExtensions *outExtensions) const

 }  // namespace rx

-#endif  // defined(ANGLE_PLATFORM_IOS)
+#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
--- a/src/libANGLE/renderer/gl/eagl/DeviceEAGL.h
+++ b/src/libANGLE/renderer/gl/eagl/DeviceEAGL.h
@@ -9,8 +9,12 @@
 #ifndef LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_
 #define LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_

-#include "libANGLE/Device.h"
-#include "libANGLE/renderer/DeviceImpl.h"
+#import "common/platform.h"
+
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
+#    include "libANGLE/Device.h"
+#    include "libANGLE/renderer/DeviceImpl.h"

 namespace rx
 {
@@ -30,4 +34,6 @@ class DeviceEAGL : public DeviceImpl

 }  // namespace rx

+#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
 #endif  // LIBANGLE_RENDERER_GL_EAGL_DEVICEEAGL_H_
--- a/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h
+++ b/src/libANGLE/renderer/gl/eagl/DisplayEAGL.h
@@ -9,14 +9,18 @@
 #ifndef LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_
 #define LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_

-#include "libANGLE/renderer/gl/DisplayGL.h"
+#import "common/platform.h"

-#ifdef __OBJC__
+#if defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
+#    include "libANGLE/renderer/gl/DisplayGL.h"
+
+#    ifdef __OBJC__
 @class EAGLContext;
 typedef EAGLContext *EAGLContextObj;
-#else
+#    else
 typedef void *EAGLContextObj;
-#endif
+#    endif

 namespace rx
 {
@@ -93,4 +97,6 @@ class DisplayEAGL : public DisplayGL

 }  // namespace rx

+#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)
+
 #endif  // LIBANGLE_RENDERER_GL_EAGL_DISPLAYEAGL_H_
--- a/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm
+++ b/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm
@@ -372,4 +372,4 @@ void DisplayEAGL::populateFeatureList(angle::FeatureList *features)
 }
 }

-#endif  // defined(ANGLE_PLATFORM_IOS)
+#endif  // defined(ANGLE_PLATFORM_IOS) && !defined(ANGLE_PLATFORM_MACCATALYST)