commit 8cc03bf73fb1ed693c46a56a2cd59b80850bfb19
author Jamie Madill <jmadill@chromium.org> Fri Apr 11 13:33:57 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Wed Apr 16 19:41:43 2014 +0000
tree 343f086104ff4f125758498dd3488dc8bac8b1a4
parent bdc9b2f0ed9e365bf5a4d19799d93a512f07dd32

Revert "Remove the second translator target, only using static."

This reverts commit d51df461e52ac9421201234fff488104f788a7c3.

Conflicts:
	projects/build/all.sln
	projects/samples/samples.sln
	src/compiler.gypi

Change-Id: I6e1d77531df61de28e4402ed1916f6ecdebb68fd
Reviewed-on: https://chromium-review.googlesource.com/192890
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/compiler.gypi

diff --git a/src/compiler.gypi b/src/compiler.gypi
index a99de85..72a2c93 100644
--- a/src/compiler.gypi
+++ b/src/compiler.gypi
@@ -14,8 +14,55 @@
 
         {
             'target_name': 'translator',
+            'type': '<(component)',
+            'dependencies': [ 'preprocessor' ],
+            'includes': [ '../build/common_defines.gypi', ],
+            'include_dirs':
+            [
+                '.',
+                '../include',
+            ],
+            'defines':
+            [
+                'ANGLE_TRANSLATOR_IMPLEMENTATION',
+            ],
+            'sources':
+            [
+                '<!@(python <(angle_path)/enumerate_files.py \
+                     -dirs compiler/translator third_party/compiler common ../include \
+                     -types *.cpp *.h *.y *.l)',
+            ],
+            'conditions':
+            [
+                ['OS=="win"',
+                    {
+                        'msvs_disabled_warnings': [ 4267 ],
+                        'sources/': [ [ 'exclude', 'compiler/translator/ossource_posix.cpp' ], ],
+                    },
+                    { # else: posix
+                        'sources/': [ [ 'exclude', 'compiler/translator/ossource_win.cpp' ], ],
+                    }
+                ],
+            ],
+            'msvs_settings':
+            {
+              'VCLibrarianTool':
+              {
+                'AdditionalOptions': ['/ignore:4221']
+              },
+            },
+        },
 
-            # TODO(jmadill): https://code.google.com/p/angleproject/issues/detail?id=569 component build
+        {
+            'target_name': 'translator_static',
+            'type': 'static_library',
+            'dependencies': [ 'preprocessor' ],
+            'includes': [ '../build/common_defines.gypi', ],
+            'include_dirs':
+            [
+                '.',
+                '../include',
+            ],
             'defines':
             [
                 'ANGLE_TRANSLATOR_STATIC',
@@ -27,15 +74,6 @@
                     'ANGLE_TRANSLATOR_STATIC',
                 ],
             },
-
-            'type': 'static_library',
-            'dependencies': [ 'preprocessor' ],
-            'includes': [ '../build/common_defines.gypi', ],
-            'include_dirs':
-            [
-                '.',
-                '../include',
-            ],
             'sources':
             [
                 '<!@(python <(angle_path)/enumerate_files.py \