Skip to content

Commit

Permalink
Deleted gl.gyp that had duplicate ppapi_egl target.
Browse files Browse the repository at this point in the history
Review URL: http://codereview.chromium.org/7283013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91320 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
evan@chromium.org committed Jul 1, 2011
1 parent 064cd05 commit 31176b0
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 59 deletions.
55 changes: 0 additions & 55 deletions ppapi/lib/gl/gl.gyp
Original file line number Diff line number Diff line change
@@ -1,55 +0,0 @@
# Copyright (c) 2010 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.


# This file was split off from ppapi.gyp to prevent PPAPI users from
# needing to DEPS in ~10K files due to mesa.

{
'includes': [
'../../../third_party/mesa/mesa.gypi',
],
'variables': {
'chromium_code': 1, # Use higher warning level.
},
'targets': [
{
'target_name': 'ppapi_egl',
'type': 'static_library',
'dependencies': [
'<(DEPTH)/ppapi/ppapi.gyp:ppapi_c',
],
'include_dirs': [
'include',
],
'defines': [
# Do not export internal Mesa funcations. Exporting them is not
# required because we are compiling both - API dispatcher and driver
# into a single library.
'PUBLIC=',
# Define a new PPAPI platform.
'_EGL_PLATFORM_PPAPI=_EGL_NUM_PLATFORMS',
'_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_PPAPI',
],
'conditions': [
['OS=="win"', {
'defines': [
'_EGL_OS_WINDOWS',
],
}],
['OS=="mac"', {
# TODO(alokp): Make this compile on mac.
'suppress_wildcard': 1,
}],
],
'sources': [
# Mesa EGL API dispatcher sources.
'<@(mesa_egl_sources)',
# PPAPI EGL driver sources.
'egl/egldriver.c',
'egl/egldriver_ppapi.c',
],
},
],
}
3 changes: 0 additions & 3 deletions ppapi/ppapi_gl.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.


# This file was split off from ppapi.gyp to prevent PPAPI users from
# needing to DEPS in ~10K files due to mesa.
{
'includes': [
'../third_party/mesa/mesa.gypi',
Expand Down
2 changes: 1 addition & 1 deletion ppapi/ppapi_tests.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
'ppapi_example_skeleton',
'ppapi.gyp:ppapi_cpp',
'ppapi.gyp:ppapi_gles2',
'lib/gl/gl.gyp:ppapi_egl',
'ppapi.gyp:ppapi_egl',
],
'include_dirs': [
'lib/gl/include',
Expand Down

0 comments on commit 31176b0

Please sign in to comment.