diff options
| author | Geoff Lang <geofflang@chromium.org> | 2013-10-08 13:29:13 -0400 |
|---|---|---|
| committer | Geoff Lang <geofflang@chromium.org> | 2013-10-17 09:52:41 -0400 |
| commit | 31f0dc0a09b1ea6ff03d235080d561840de8eb66 (patch) | |
| tree | 5ccfae3f5b753f4f7ea3a59dabfd784ca24cfe89 /include | |
| parent | 5e5f990e1c86e8776f7d974c95d0b63052bb36ed (diff) | |
| download | angle-31f0dc0a09b1ea6ff03d235080d561840de8eb66.tar.gz | |
Merge a0bd8ef0aca9eab29a0e5a437b803c5d95a777c6 from master.
Use ANGLE_TRANSLATOR_STATIC to enforce a static build of the translator in
chromium.
This prevents strange warnings from defining COMPONENT_BUILD=0.
Also rename COMPILER_IMPLEMENTATION to ANGLE_TRANSLATOR_IMPLEMENTATION
for better consistency in chromium.
ANGLEBUG=477
R=zmo@chromium.org
BUG=
Diffstat (limited to 'include')
| -rw-r--r-- | include/GLSLANG/ShaderLang.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/GLSLANG/ShaderLang.h b/include/GLSLANG/ShaderLang.h index ba721cc4..f6a348f9 100644 --- a/include/GLSLANG/ShaderLang.h +++ b/include/GLSLANG/ShaderLang.h @@ -6,20 +6,20 @@ #ifndef _COMPILER_INTERFACE_INCLUDED_ #define _COMPILER_INTERFACE_INCLUDED_ -#if defined(COMPONENT_BUILD) +#if defined(COMPONENT_BUILD) && !defined(ANGLE_TRANSLATOR_STATIC) #if defined(_WIN32) || defined(_WIN64) -#if defined(COMPILER_IMPLEMENTATION) +#if defined(ANGLE_TRANSLATOR_IMPLEMENTATION) #define COMPILER_EXPORT __declspec(dllexport) #else #define COMPILER_EXPORT __declspec(dllimport) -#endif // defined(COMPILER_IMPLEMENTATION) +#endif // defined(ANGLE_TRANSLATOR_IMPLEMENTATION) -#else // defined(WIN32) +#else // defined(_WIN32) || defined(_WIN64) #define COMPILER_EXPORT __attribute__((visibility("default"))) #endif -#else // defined(COMPONENT_BUILD) +#else // defined(COMPONENT_BUILD) && !defined(ANGLE_TRANSLATOR_STATIC) #define COMPILER_EXPORT #endif |