Edit

kc3-lang/angle/src/libEGL.gypi

Branch :

  • Show log

    Commit

  • Author : Jamie Madill
    Date : 2018-05-14 09:11:51
    Hash : 74a76320
    Message : Fix libGLESv2 wrong .def file. The GN was including both libGLESv2.def and _autogen. This fixes the GN to only include _autogen, and removes the .def include from the static build target. Bug: angleproject:2476 Change-Id: I2e856e3bbe875bdadd1add4517cef60a11227047 Reviewed-on: https://chromium-review.googlesource.com/1057451 Reviewed-by: Nico Weber <thakis@chromium.org> Reviewed-by: Brandon1 Jones <brandon1.jones@intel.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

  • src/libEGL.gypi
  • # Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
    # Use of this source code is governed by a BSD-style license that can be
    # found in the LICENSE file.
    
    {
        # Everything below this is duplicated in the GN build. If you change
        # anything also change angle/BUILD.gn
        'targets':
        [
            {
                'target_name': 'libEGL',
                'type': '<(angle_gl_library_type)',
                'dependencies':
                [
                    'libGLESv2',
                ],
                'includes':
                [
                    '../gyp/common_defines.gypi',
                ],
                'include_dirs':
                [
                    '.',
                    '../include',
                ],
                'sources':
                [
                    'libEGL/libEGL.def',
                    '<@(libegl_sources)',
                ],
                'conditions':
                [
                    ['angle_build_winrt==1',
                    {
                        'msvs_requires_importlibrary' : 'true',
                    }],
                    ['OS=="win"', {
                        'defines':
                        [
                            'EGLAPI=',
                        ],
                    }, {
                        'defines':
                        [
                            'EGLAPI=__attribute__((visibility("default")))',
                        ],
                    }],
                    ['OS == "mac"',
                    {
                        'xcode_settings':
                        {
                            'DYLIB_INSTALL_NAME_BASE': '@rpath',
                        },
                    }],
                ],
            },
    
            {
                'target_name': 'libEGL_static',
                'type': 'static_library',
                'dependencies':
                [
                    'libGLESv2_static',
                ],
                'includes':
                [
                    '../gyp/common_defines.gypi',
                ],
                'include_dirs':
                [
                    '.',
                    '../include',
                ],
                'sources':
                [
                    '<@(libegl_sources)',
                ],
                'defines':
                [
                    'EGLAPI=',
                ],
                'direct_dependent_settings':
                {
                    'defines':
                    [
                        'EGLAPI=',
                    ],
                },
            },
        ],
    }