From 0a7aebadfbb3534284546aa3ca8612314c08f136 Mon Sep 17 00:00:00 2001 From: Miguel Costa Date: Tue, 26 Jun 2018 16:56:45 +0200 Subject: Update ANGLE to chromium/3280 Change-Id: I0802c0d7486f772d361f87a544d6c5af937f4ca1 Reviewed-by: Friedemann Kleint --- src/3rdparty/angle/include/export.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/3rdparty/angle/include/export.h') diff --git a/src/3rdparty/angle/include/export.h b/src/3rdparty/angle/include/export.h index cdf6245d6d..cf144f92a5 100644 --- a/src/3rdparty/angle/include/export.h +++ b/src/3rdparty/angle/include/export.h @@ -9,14 +9,17 @@ #ifndef LIBGLESV2_EXPORT_H_ #define LIBGLESV2_EXPORT_H_ +#if !defined(ANGLE_EXPORT) #if defined(_WIN32) -# if defined(LIBGLESV2_IMPLEMENTATION) || defined(LIBANGLE_IMPLEMENTATION) +#if defined(LIBGLESV2_IMPLEMENTATION) || defined(LIBANGLE_IMPLEMENTATION) || \ + defined(LIBANGLE_UTIL_IMPLEMENTATION) # define ANGLE_EXPORT __declspec(dllexport) # else # define ANGLE_EXPORT __declspec(dllimport) # endif #elif defined(__GNUC__) -# if defined(LIBGLESV2_IMPLEMENTATION) || defined(LIBANGLE_IMPLEMENTATION) +#if defined(LIBGLESV2_IMPLEMENTATION) || defined(LIBANGLE_IMPLEMENTATION) || \ + defined(LIBANGLE_UTIL_IMPLEMENTATION) # define ANGLE_EXPORT __attribute__((visibility ("default"))) # else # define ANGLE_EXPORT @@ -24,5 +27,6 @@ #else # define ANGLE_EXPORT #endif +#endif // !defined(ANGLE_EXPORT) #endif // LIBGLESV2_EXPORT_H_ -- cgit v1.2.3