Merge a0bd8ef0 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=

Merge a0bd8ef0 from master.
31f0dc0a · Geoff Lang · 5e5f990e · 31f0dc0a · 31f0dc0a
Commit 31f0dc0a authored Oct 08, 2013 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

ShaderLang.h include/GLSLANG/ShaderLang.h +5 -5

compiler.gypi src/compiler.gypi +2 -2

No files found.
--- 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


--- a/src/compiler.gypi
+++ b/src/compiler.gypi
@@ -24,7 +24,7 @@
            ],
            'defines':
            [
-                'COMPILER_IMPLEMENTATION',
+                'ANGLE_TRANSLATOR_IMPLEMENTATION',
            ],
            'sources': [ '<!@(python enumerate_files.py compiler/translator third_party/compiler common -types *.cpp *.h *.y *.l )', ],
            'conditions':
@@ -52,7 +52,7 @@
            ],
            'defines':
            [
-                'COMPILER_IMPLEMENTATION',
+                'ANGLE_TRANSLATOR_STATIC',
            ],
            'direct_dependent_settings':
            {