Added command buffer unit tests to gyp.

Can optionally override default renderer with environment variable. One of:
GYP_DEFINES = "renderer=d3d9"
GYP_DEFINES = "renderer=gl"
GYP_DEFINES = "renderer=cb cb_service=d3d9"
GYP_DEFINES = "renderer=cb cb_service=gl"

Fixed some warnings.

Works on windows with D3D9 but not GL, mac or linux yet.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/208037

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

1 files changed, 49 insertions, 6 deletions

diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi
index aa9ffe5..e847b54 100644
--- a/o3d/build/common.gypi
+++ b/o3d/build/common.gypi
@@ -6,6 +6,7 @@
   'variables': {
     'antlrdir': 'third_party/antlr3',
     'breakpaddir': 'breakpad/src',
+    'cb_service%': 'none',
     'fcolladadir': 'third_party/fcollada/files',
     'glewdir': 'third_party/glew/files',
     'gtestdir': 'testing/gtest/include',
@@ -41,7 +42,7 @@
     ['OS == "win"',
       {
         'variables': {
-          'renderer': 'd3d9',
+          'renderer%': 'd3d9',
           'cgdir': 'third_party/cg/files/win',
           'swiftshaderdir': 'o3d-internal/third_party/swiftshader/files',
           'LIBRARY_SUFFIX': '.lib',
@@ -49,7 +50,6 @@
         'target_defaults': {
           'defines': [
             '_CRT_SECURE_NO_WARNINGS',
-            'RENDERER_D3D9',
             'OS_WIN',
             'UNICODE',
             'NACL_WINDOWS',
@@ -62,13 +62,12 @@
     ['OS == "mac"',
       {
         'variables': {
-          'renderer': 'gl',
+          'renderer%': 'gl',
           'cgdir': 'third_party/cg/files/mac',
           'LIBRARY_SUFFIX': '.a',
         },
         'target_defaults': {
           'defines': [
-            'RENDERER_GL',
             'OS_MACOSX',
             'UNICODE',
             'GTEST_NOT_MAC_FRAMEWORK_MODE',
@@ -99,7 +98,7 @@
     ['OS == "linux"',
       {
         'variables': {
-          'renderer': 'gl',
+          'renderer%': 'gl',
           'cgdir': 'third_party/cg/files/linux',
           'LIBRARY_SUFFIX': '.a',
         },
@@ -109,7 +108,6 @@
             'MOZ_X11',
             'NACL_LINUX=1',
             'OS_LINUX',
-            'RENDERER_GL',
             'SK_BUILD_FOR_UNIX',
             'UNICODE',
             'XP_UNIX',
@@ -121,5 +119,50 @@
         },
       },
     ],
+    ['renderer == "d3d9"',
+      {
+        'target_defaults': {
+          'defines': [
+            'RENDERER_D3D9',
+          ],
+        },
+      },
+    ],
+    ['renderer == "gl"',
+      {
+        'target_defaults': {
+          'defines': [
+            'RENDERER_GL',
+          ],
+        },
+      },
+    ],
+    ['renderer == "cb"',
+      {
+        'target_defaults': {
+          'defines': [
+            'RENDERER_CB',
+          ],
+        },
+      },
+    ],
+    ['cb_service == "d3d9"',
+      {
+        'target_defaults': {
+          'defines': [
+            'CB_SERVICE_D3D9',
+          ],
+        },
+      },
+    ],
+    ['cb_service == "gl"',
+      {
+        'target_defaults': {
+          'defines': [
+            'CB_SERVICE_GL',
+          ],
+        },
+      },
+    ],
   ],
 }