commit 16545669136028420f67ac496c45c2e9a32ed5a9
author Jamie Madill <jmadill@chromium.org> Fri Dec 05 20:02:08 2014
committer Jamie Madill <jmadill@chromium.org> Fri Dec 05 20:44:06 2014
tree 8982936c686be99da2d8a453c0eaccdf0fad3ef8
parent 1a05ce9305f471a83f39630923607a5bd1e553c8

Move libEGL to compile on all platforms.

BUG=angle:773

Change-Id: I377c6df9b1f10e2756b7f000099847dc910c965c
Reviewed-on: https://chromium-review.googlesource.com/232793
Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libEGL.gypi

diff --git a/src/libEGL.gypi b/src/libEGL.gypi
index 03ebd7a..1190596 100644
--- a/src/libEGL.gypi
+++ b/src/libEGL.gypi
@@ -5,56 +5,49 @@
 {
     # Everything below this is duplicated in the GN build. If you change
     # anything also change angle/BUILD.gn
-    'conditions':
+    'targets':
     [
-        ['OS=="win"',
         {
-            'targets':
+            'target_name': 'libEGL',
+            'type': 'shared_library',
+            'dependencies': [ 'libGLESv2', ],
+            'includes': [ '../build/common_defines.gypi', ],
+            'include_dirs':
             [
+                '.',
+                '../include',
+            ],
+            'sources':
+            [
+                '<@(libegl_sources)',
+            ],
+            'defines':
+            [
+                'GL_APICALL=',
+                'GL_GLEXT_PROTOTYPES=',
+                'EGLAPI=',
+                'LIBEGL_IMPLEMENTATION',
+            ],
+            'conditions':
+            [
+                ['angle_build_winrt==1',
                 {
-                    'target_name': 'libEGL',
-                    'type': 'shared_library',
-                    'dependencies': [ 'libGLESv2', ],
-                    'includes': [ '../build/common_defines.gypi', ],
-                    'include_dirs':
-                    [
-                        '.',
-                        '../include',
-                    ],
-                    'sources':
-                    [
-                        '<@(libegl_sources)',
-                    ],
-                    'defines':
-                    [
-                        'GL_APICALL=',
-                        'GL_GLEXT_PROTOTYPES=',
-                        'EGLAPI=',
-                        'LIBEGL_IMPLEMENTATION',
-                    ],
-                    'conditions':
-                    [
-                        ['angle_build_winrt==1',
+                    'msvs_enable_winrt' : '1',
+                    'msvs_requires_importlibrary' : 'true',
+                    'msvs_settings':
+                    {
+                        'VCLinkerTool':
                         {
-                            'msvs_enable_winrt' : '1',
-                            'msvs_requires_importlibrary' : 'true',
-                            'msvs_settings':
-                            {
-                                'VCLinkerTool':
-                                {
-                                    'EnableCOMDATFolding': '1',
-                                    'OptimizeReferences': '1',
-                                }
-                            },
-                        }],
-                        ['angle_build_winphone==1',
-                        {
-                            'msvs_enable_winphone' : '1',
-                        }],
-                    ],
-                },
+                            'EnableCOMDATFolding': '1',
+                            'OptimizeReferences': '1',
+                        }
+                    },
+                }],
+                ['angle_build_winphone==1',
+                {
+                    'msvs_enable_winphone' : '1',
+                }],
             ],
         },
-        ],
     ],
 }