MacOS build fix

Fixed MacOS build after the recent Linux fix caused an issue on MacOS. Removed a few flags and changed visibility to fix it. Change-Id: Ic9d08d8ec0ccf8a2002f2787c3ec79861bb59139 Reviewed-on: https://swiftshader-review.googlesource.com/8589Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

MacOS build fix
b1031c89 · Alexis Hetu · Alexis Hétu · d294def5 · b1031c89 · b1031c89
Commit b1031c89 authored Jan 30, 2017 by Alexis Hetu Committed by Alexis Hétu Jan 30, 2017
Show whitespace changes
Inline Side-by-side

Showing with 14 additions and 2 deletions

BUILD.gn BUILD.gn +2 -0

BUILD.gn src/OpenGL/libEGL/BUILD.gn +6 -1

BUILD.gn src/OpenGL/libGLESv2/BUILD.gn +6 -1

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -73,11 +73,13 @@ config("swiftshader_config") {
      ]
    }
+    if (is_linux) {
      ldflags = [
        "-Wl,--hash-style=both",
        "-Wl,--gc-sections",
      ]
    }
+  }
 }
 group("swiftshader") {

--- a/src/OpenGL/libEGL/BUILD.gn
+++ b/src/OpenGL/libEGL/BUILD.gn
@@ -25,10 +25,15 @@ config("swiftshader_libEGL_private_config") {
  } else {
    cflags = [
      "-DLOG_TAG=\"swiftshader_libEGL\"",
-      "-DEGLAPI=__attribute__((visibility(\"protected\")))",
      "-DEGL_EGLEXT_PROTOTYPES",
      "-Wno-sign-compare",
    ]
+    if (is_linux) {
+      cflags += [ "-DGL_APICALL=__attribute__((visibility(\"protected\")))" ]
+    } else {
+      cflags += [ "-DGL_APICALL=__attribute__((visibility(\"default\")))" ]
+    }
  }
 }

--- a/src/OpenGL/libGLESv2/BUILD.gn
+++ b/src/OpenGL/libGLESv2/BUILD.gn
@@ -36,10 +36,15 @@ config("swiftshader_libGLESv2_private_config") {
      "-D__STDC_CONSTANT_MACROS",
      "-D__STDC_LIMIT_MACROS",
      "-DGL_API=",
-      "-DGL_APICALL=__attribute__((visibility(\"protected\")))",
      "-DGL_GLEXT_PROTOTYPES",
      "-Wno-sign-compare",
    ]
+    if (is_linux) {
+      cflags += [ "-DGL_APICALL=__attribute__((visibility(\"protected\")))" ]
+    } else {
+      cflags += [ "-DGL_APICALL=__attribute__((visibility(\"default\")))" ]
+    }
  }
 }