This rearranges where the renderer variable is set so that GYP

doesn't complain when we're part of the Chrome build.
Review URL: http://codereview.chromium.org/267025

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

3 files changed, 25 insertions, 58 deletions

diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi
index 31697fd..9f058c4 100644
--- a/o3d/build/common.gypi
+++ b/o3d/build/common.gypi
@@ -28,6 +28,30 @@
     'o3d_developer%': '<!(python <(DEPTH)/o3d/build/file_exists.py '
                       '../o3d_assets/samples/convert_assets/teapot.zip)',
     'selenium_screenshots%': 0,
+    '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',
+          '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',
+        },
+      ],
+    ],
   },
   'target_defaults': {
     'defines': [
@@ -60,12 +84,6 @@
   'conditions' : [
     ['OS == "win"',
       {
-        'variables': {
-          'renderer%': 'd3d9',
-          'cgdir': 'third_party/cg/files/win',
-          'swiftshaderdir': 'o3d-internal/third_party/swiftshader/files',
-          'LIBRARY_SUFFIX': '.lib',
-        },
         'target_defaults': {
           'defines': [
             '_CRT_SECURE_NO_WARNINGS',
@@ -104,11 +122,6 @@
     ],
     ['OS == "mac"',
       {
-        'variables': {
-          'renderer%': 'gl',
-          'cgdir': 'third_party/cg/files/mac',
-          'LIBRARY_SUFFIX': '.a',
-        },
         'target_defaults': {
           'defines': [
             'OS_MACOSX',
@@ -155,11 +168,6 @@
     ],
     ['OS == "linux"',
       {
-        'variables': {
-          'renderer%': 'gl',
-          'cgdir': 'third_party/cg/files/linux',
-          'LIBRARY_SUFFIX': '.a',
-        },
         'target_defaults': {
           'defines': [
             'LINUX',
@@ -213,9 +221,3 @@
     ],
   ],
 }
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/o3d/build/o3d_minimal.gyp b/o3d/build/o3d_minimal.gyp
index 399638b..200c9cb 100644
--- a/o3d/build/o3d_minimal.gyp
+++ b/o3d/build/o3d_minimal.gyp
@@ -11,25 +11,7 @@
       'target_name': 'O3D_Minimal',
       'type': 'none',
       'dependencies': [
-        '../plugin/plugin.gyp:o3dPlugin_gen',
-      ],
-    },
-  ],
-}
-# 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.
-
-{
-  'includes': [
-    'common.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'O3D_Minimal',
-      'type': 'none',
-      'dependencies': [
-        '../plugin/plugin.gyp:o3dPlugin_gen',
+        '../plugin/plugin.gyp:o3dPlugin',
       ],
     },
   ],
diff --git a/o3d/build/select_dependencies.py b/o3d/build/select_dependencies.py
index a69afe2..d9fb546 100644
--- a/o3d/build/select_dependencies.py
+++ b/o3d/build/select_dependencies.py
@@ -15,20 +15,3 @@ if has_assets:
 else:
   print "o3d_minimal.gyp"
 sys.exit(0)
-#!/usr/bin/env python
-# 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.
-
-"""This file selects which of the sets of dependencies are used
-   when Chrome includes o3d.gyp"""
-
-import os.path
-import sys
-
-has_assets = os.path.exists(os.path.join("..", "o3d_assets"))
-if has_assets:
-  print "o3d_all.gyp"
-else:
-  print "o3d_minimal.gyp"
-sys.exit(0)