This changes how we do gyp targets that generate code because GYP isn't

yet consistent across platforms, and the old way won't work on the Mac.

Also, updated to include bitmap.idl in the idl build, and fixed a signed/unsigned
mismatch warning in bitmap.cc
Review URL: http://codereview.chromium.org/155612

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20830 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 31 deletions

diff --git a/o3d/compiler/technique/technique.gyp b/o3d/compiler/technique/technique.gyp
index 3e222e3..cd2f865 100644
--- a/o3d/compiler/technique/technique.gyp
+++ b/o3d/compiler/technique/technique.gyp
@@ -12,8 +12,16 @@
   ],
   'targets': [
     {
-      'target_name': 'parser_generator',
-      'type': 'none',
+      'target_name': 'technique',
+      'type': 'static_library',
+      'dependencies': [
+        '../../../<(antlrdir)/antlr.gyp:antlr3c',
+        '../../../base/base.gyp:base',
+        '../../core/core.gyp:o3dCore',
+      ],
+      'include_dirs': [
+        '<(technique_out_dir)',
+      ],
       'rules': [
         {
           'rule_name': 'technique_parser',
@@ -27,6 +35,7 @@
             '<(technique_out_dir)/<(RULE_INPUT_ROOT)Parser.c',
             '<(technique_out_dir)/<(RULE_INPUT_ROOT)Parser.h',
           ],
+          'process_outputs_as_sources': 1,
           'action': [
             'java',
             '-cp', '../../../<(antlrdir)/lib/antlr-3.1.1.jar',
@@ -38,30 +47,6 @@
       ],
       'sources': [
         'Technique.g3pl',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(technique_out_dir)',
-        ],
-      },
-    },
-    {
-      'target_name': 'technique',
-      'type': 'static_library',
-      'dependencies': [
-        'parser_generator',
-        '../../../<(antlrdir)/antlr.gyp:antlr3c',
-        '../../../base/base.gyp:base',
-        '../../core/core.gyp:o3dCore',
-      ],
-      'include_dirs': [
-        '<(technique_out_dir)',
-      ],
-      'sources': [
-        '<(technique_out_dir)/TechniqueLexer.c',
-        '<(technique_out_dir)/TechniqueLexer.h',
-        '<(technique_out_dir)/TechniqueParser.c',
-        '<(technique_out_dir)/TechniqueParser.h',
         'technique_error.cc',
         'technique_error.h',
         'technique_parser.cc',
@@ -69,16 +54,17 @@
         'technique_structures.cc',
         'technique_structures.h',
       ],
-      'msvs_settings': {
-        'VCCLCompilerTool': {
-          'CompileAs': '2',
-        },
-      },
+      'hard_dependency': 1,
       'direct_dependent_settings': {
         'include_dirs': [
           '<(technique_out_dir)',
         ],
       },
+      'msvs_settings': {
+        'VCCLCompilerTool': {
+          'CompileAs': '2',
+        },
+      },
     },
   ],
 }