Trying to fix the build. gman taking over.

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

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

4 files changed, 12 insertions, 11 deletions

diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp
index 1e8b4f2..3f553c8 100644
--- a/o3d/build/libs.gyp
+++ b/o3d/build/libs.gyp
@@ -15,7 +15,7 @@
     {
       'target_name': 'gl_libs',
       'type': 'none',
-      'direct_dependent_settings': {
+      'all_dependent_settings': {
         'include_dirs': [
           '../../<(glewdir)/include',
         ],
@@ -23,7 +23,7 @@
       'conditions': [
         [ 'OS=="linux"',
           {
-            'direct_dependent_settings': {
+            'all_dependent_settings': {
               'defines': [
                 'GL_GLEXT_PROTOTYPES',
               ],
@@ -42,7 +42,7 @@
         ],
         [ 'OS=="mac"',
           {
-            'direct_dependent_settings': {
+            'all_dependent_settings': {
               'libraries': [
                 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
               ],
@@ -51,7 +51,7 @@
         ],
         [ 'OS=="win"',
           {
-            'direct_dependent_settings': {
+            'all_dependent_settings': {
               'libraries': [
                 '-lOpenGL32.lib',
                 '../../<(glewdir)/lib/glew32.lib',
@@ -65,7 +65,7 @@
       'target_name': 'cg_libs',
       'type': 'none',
       'hard_dependency': 1,
-      'direct_dependent_settings': {
+      'all_dependent_settings': {
         'include_dirs': [
           '../../<(cgdir)/include',
         ],
@@ -73,7 +73,7 @@
       'conditions': [
         [ 'OS=="linux"',
           {
-            'direct_dependent_settings': {
+            'all_dependent_settings': {
               'scons_variable_settings': {
                 'LIBPATH': [
                   '<(PRODUCT_DIR)',
@@ -88,7 +88,7 @@
         ],
         [ 'OS=="win"',
           {
-            'direct_dependent_settings': {
+            'all_dependent_settings': {
               'libraries': [
                 "../../<(cgdir)/lib/cg.lib",
                 "../../<(cgdir)/lib/cgD3D9.lib",
@@ -100,7 +100,7 @@
         ],
         [ 'OS=="mac"',
           {
-            'direct_dependent_settings': {
+            'all_dependent_settings': {
               'mac_framework_dirs': [
                 "<(PRODUCT_DIR)/Library/Frameworks",
               ],
@@ -156,7 +156,7 @@
           {
             'target_name': 'dx_dll',
             'type': 'none',
-            'direct_dependent_settings': {
+            'all_dependent_settings': {
               'include_dirs': [
                 '$(DXSDK_DIR)/Include',
               ],
diff --git a/o3d/command_buffer/common/cross/cmd_buffer_format.h b/o3d/command_buffer/common/cross/cmd_buffer_format.h
index e546f83..465a692 100644
--- a/o3d/command_buffer/common/cross/cmd_buffer_format.h
+++ b/o3d/command_buffer/common/cross/cmd_buffer_format.h
@@ -141,7 +141,7 @@ namespace command_buffer {
 
 // GAPI commands.
 enum CommandId {
-  kStartPoint = cmd::kLastCommonId,  // All O3D commands start after this.
+//  kStartPoint = cmd::kLastCommonId,  // All O3D commands start after this.
   #define O3D_COMMAND_BUFFER_CMD_OP(name) k ## name,
 
   O3D_COMMAND_BUFFER_CMDS(O3D_COMMAND_BUFFER_CMD_OP)
diff --git a/o3d/core/win/display_window_win.h b/o3d/core/win/display_window_win.h
index 9ba5670..8684b1b 100644
--- a/o3d/core/win/display_window_win.h
+++ b/o3d/core/win/display_window_win.h
@@ -33,6 +33,8 @@
 #ifndef O3D_CORE_WIN_DISPLAY_WINDOW_WIN_H_
 #define O3D_CORE_WIN_DISPLAY_WINDOW_WIN_H_
 
+#include <windows.h>
+
 #include "core/cross/display_window.h"
 
 namespace o3d {
diff --git a/o3d/plugin/cross/main.h b/o3d/plugin/cross/main.h
index 08455fe..d4e1d24 100644
--- a/o3d/plugin/cross/main.h
+++ b/o3d/plugin/cross/main.h
@@ -37,7 +37,6 @@
 #ifndef O3D_PLUGIN_CROSS_MAIN_H_
 #define O3D_PLUGIN_CROSS_MAIN_H_
 
-#include <GL/glew.h>
 #include "core/cross/renderer_platform.h"
 
 #include <npupp.h>