Removed command_buffer dependency on vectormath (indirectly via core/types.h)...

build/common.gypi

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'antlrdir': 'third_party/antlr3',
     'breakpaddir': 'breakpad/src',
     'fcolladadir': 'third_party/fcollada/files',
     'glewdir': 'third_party/glew/files',
     'gtestdir': 'testing/gtest/include',
     'internaldir':'o3d-internal',
     'jpegdir': 'third_party/libjpeg',
     'nacldir': 'third_party/native_client/googleclient',
     'nixysadir': 'o3d/third_party/nixysa',
     'npapidir': 'o3d/third_party/npapi',
     'pdiffdir': 'third_party/pdiff/files',
     'pngdir': 'third_party/libpng',
     'screenshotsdir': 'o3d_assets/tests/screenshots',
     'seleniumdir': 'third_party/selenium_rc/files',
     'skiadir': 'third_party/skia/include',
     'zlibdir': 'third_party/zlib',
-    # If the DEPS file exists two levels up, then we're in a Chrome tree.
-    'o3d_in_chrome%': '<!(python <(DEPTH)/o3d/build/file_exists.py <(DEPTH)/DEPS)',
+
+    # Hack to ensure that these variables (specifically "renderer" and
+    # "cb_service") are available later in the file. Long term solution is late
+    # evaluation of variables.
+    'variables': {
+      # If the DEPS file exists two levels up, then we're in a Chrome tree.
+      'o3d_in_chrome%': '<!(python <(DEPTH)/o3d/build/file_exists.py <(DEPTH)/DEPS)',
+      'conditions' : [
+        # These have to come first because GYP doesn't like it when
+        # they're part of the same conditional as a conditions clause that
+        # uses them.
+        ['OS == "win"',
+          {
+            'cgdir': 'third_party/cg/files/win',
+            'renderer%': 'd3d9',
+            'cb_service%': 'none',
+            'swiftshaderdir': 'o3d-internal/third_party/swiftshader/files',
+          },
+        ],
+        ['OS == "mac"',
+          {
+            'cgdir': 'third_party/cg/files/mac',
+            'renderer%': 'gl',
+            'cb_service%': 'none',
+            'swiftshaderdir': '',
+          },
+        ],
+        ['OS == "linux"',
+          {
+            'cgdir': 'third_party/cg/files/linux',
+            'renderer%': 'gl',
+            'cb_service%': 'none',
+            'swiftshaderdir': '',
+          },
+        ],
+      ],
+    },
+    'o3d_in_chrome%': '<(o3d_in_chrome)',
+    'renderer%': '<(renderer)',
+    'cgdir%': '<(cgdir)',
+    'swiftshaderdir%': '<(swiftshaderdir)',
+    'cb_service%': '<(cb_service)',
+
     # We default to building everything only if the assets exist.
     # (and the teapot is the least likely asset to change).
     # This is so that chrome developers get a much reduced dependency set.
     'o3d_developer%': '<!(python <(DEPTH)/o3d/build/file_exists.py '
                       '<(DEPTH)/o3d/o3d_assets/samples/convert_assets/teapot.zip)',
     'selenium_screenshots%': 0,
-    'cb_service%': 'none',
+
     'conditions' : [
-      # These have to come first because GYP doesn't like it when
-      # they're part of the same conditional as a conditions clause that
-      # uses them.
-      ['OS == "win"',
+      ['o3d_in_chrome == "True"',
         {
-          'cgdir': 'third_party/cg/files/win',
-          'renderer%': 'd3d9',
-          'swiftshaderdir': 'o3d-internal/third_party/swiftshader/files',
-        },
-      ],
-      ['OS == "mac"',
-        {
-          'cgdir': 'third_party/cg/files/mac',
-          'renderer%': 'gl',
-        },
-      ],
-      ['OS == "linux"',
-        {
-          'cgdir': 'third_party/cg/files/linux',
-          'renderer%': 'gl',
+          'renderer': 'cb',
+          'conditions': [
+            ['OS == "win"',
+              {
+                'cb_service': 'd3d9',
+              },
+              {
+                'cb_service': 'gl',
+              },
+            ],
+          ],
         },
       ],
     ],
   },
   'target_defaults': {
     'defines': [
       'GYP_BUILD',  # Needed to make a change in base/types.h conditional.
     ],
     # This needs to be in a target_conditions block in order to successfully
     # override the xcode_settings in ../../build/common.gypi.
@@ skipping 143 matching lines @@
       {
         'target_defaults': {
           'defines': [
             'CB_SERVICE_GL',
           ],
         },
       },
     ],
   ],
 }