Fix GN build for libEGL.

Our build in GN differed slightly from our gyp build, causing the linker to complain about inconsistent linkage. Also remove some stray definitions of EGLAPI from our headers. Change-Id: I5d3a09ccb0cec528ead33944ce0996cceed32d86 Reviewed-on: https://chromium-review.googlesource.com/210821Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>

Fix GN build for libEGL.
7bf0c867 · Jamie Madill · 58c55c13 · 7bf0c867 · 7bf0c867 · 7bf0c867
Commit 7bf0c867 authored Aug 01, 2014 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

BUILD.gn BUILD.gn +7 -1

Config.h src/libEGL/Config.h +0 -1

Surface.h src/libEGL/Surface.h +1 -2

main.h src/libEGL/main.h +0 -1

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -199,6 +199,12 @@ if (is_win) {
  shared_library("libEGL") {
    sources = rebase_path(egl_gypi.angle_libegl_sources, ".", "src")

+    defines = [
+      "GL_APICALL=",
+      "GL_GLEXT_PROTOTYPES=",
+      "EGLAPI=",
+    ]
+
    configs -= [ "//build/config/compiler:chromium_code" ]
    configs += [
      ":internal_config",
@@ -206,7 +212,7 @@ if (is_win) {
    ]

    if (is_debug) {
-      defines = [ "ANGLE_ENABLE_PERF" ]
+      defines += [ "ANGLE_ENABLE_PERF" ]
    }

    include_dirs = [ "src/libGLESv2" ]

--- a/src/libEGL/Config.h
+++ b/src/libEGL/Config.h
@@ -11,7 +11,6 @@
 #ifndef INCLUDE_CONFIG_H_
 #define INCLUDE_CONFIG_H_

-#define EGLAPI
 #include <EGL/egl.h>

 #include <set>

--- a/src/libEGL/Surface.h
+++ b/src/libEGL/Surface.h
@@ -11,7 +11,6 @@
 #ifndef LIBEGL_SURFACE_H_
 #define LIBEGL_SURFACE_H_

-#define EGLAPI
 #include <EGL/egl.h>

 #include "common/angleutils.h"
@@ -105,7 +104,7 @@ private:
    EGLint mSwapInterval;
    EGLint mPostSubBufferSupported;
    EGLint mFixedSize;
-    
+
    bool mSwapIntervalDirty;
    gl::Texture2D *mTexture;
 };

--- a/src/libEGL/main.h
+++ b/src/libEGL/main.h
@@ -9,7 +9,6 @@
 #ifndef LIBEGL_MAIN_H_
 #define LIBEGL_MAIN_H_

-#define EGLAPI
 #include <EGL/egl.h>
 #include <EGL/eglext.h>