These are gyp file changes that start to make the Mac GYP build work.

It still doesn't but I want to checkpoint these changes.

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

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

12 files changed, 69 insertions, 35 deletions

diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp
index e518310..f7b2829 100644
--- a/o3d/DEPS_gyp
+++ b/o3d/DEPS_gyp
@@ -3,7 +3,7 @@ vars = {
     "http://src.chromium.org/svn/trunk",
   "nixysa_rev": "28",
   "chromium_rev": "19644",
-  "o3d_code_rev": "95",
+  "o3d_code_rev": "97",
 }
 
 deps = {
@@ -54,6 +54,9 @@ deps = {
   "third_party/skia":
     "http://skia.googlecode.com/svn/trunk@239",
 
+  "third_party/libevent":
+    Var("chromium_trunk") + "/src/third_party/libevent@" + Var("chromium_rev"),
+
   "third_party/boost":
     Var("chromium_trunk") + "/src/third_party/boost@" + Var("chromium_rev"),
 
diff --git a/o3d/build/all.gyp b/o3d/build/all.gyp
index 43ea2ae..dfb41e1 100644
--- a/o3d/build/all.gyp
+++ b/o3d/build/all.gyp
@@ -17,17 +17,20 @@
         '../../<(jpegdir)/libjpeg.gyp:*',
         '../../<(pngdir)/libpng.gyp:*',
         '../../<(zlibdir)/zlib.gyp:*',
-        '../../base/base.gyp:base',
-        '../../breakpad/breakpad.gyp:*',
-        '../compiler/technique/technique.gyp:*',
-        '../converter/converter.gyp:*',
-        '../core/core.gyp:*',
-        '../import/import.gyp:*',
-        '../tests/tests.gyp:*',
-        '../plugin/idl/idl.gyp:*',
-        '../plugin/plugin.gyp:*',
-        '../serializer/serializer.gyp:*',
-        '../utils/utils.gyp:*',
+        '../compiler/technique/technique.gyp:technique',
+        '../converter/converter.gyp:o3dConverter',
+        '../core/core.gyp:o3dCore',
+        '../core/core.gyp:o3dCorePlatform',
+        '../import/archive.gyp:o3dArchive',
+        '../import/import.gyp:o3dImport',
+        '../plugin/idl/idl.gyp:o3dPluginIdl',
+        '../plugin/plugin.gyp:add_version',
+        '../plugin/plugin.gyp:npo3dautoplugin',
+        '../plugin/plugin.gyp:o3dPluginLogging',
+        '../serializer/serializer.gyp:o3dSerializer',
+        '../statsreport/statsreport.gyp:o3dStatsReport',
+        '../tests/tests.gyp:unit_tests',
+        '../utils/utils.gyp:o3dUtils',
       ],
     },
   ],
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi
index 08f3906..0d0f714 100644
--- a/o3d/build/common.gypi
+++ b/o3d/build/common.gypi
@@ -10,6 +10,7 @@
     'antlrdir': 'third_party/antlr3',
     'breakpaddir': 'breakpad/src',
     'fcolladadir': 'third_party/fcollada/files',
+    'glewdir': 'third_party/glew/files',
     'gtestdir': 'testing/gtest/include',
     'jpegdir': 'third_party/libjpeg',
     'nacldir': 'third_party/native_client/googleclient',
@@ -39,6 +40,7 @@
             '_CRT_SECURE_NO_WARNINGS',
             'RENDERER_D3D9',
             'OS_WIN',
+            'UNICODE',
             'NACL_WINDOWS',
           ],
           'msvs_disabled_warnings': [4355],
@@ -62,7 +64,19 @@
           'defines': [
             'RENDERER_GL',
             'OS_MACOSX',
+            'UNICODE',
+            'GTEST_NOT_MAC_FRAMEWORK_MODE',
+            'NACL_OSX=1',
+            'MAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_4',
+            'SK_BUILD_FOR_MAC',
           ],
+          'xcode_settings': {
+            'CFLAGS': ['-gstabs+',
+                       '-fno-eliminate-unused-debug-symbols',
+                       '-mmacosx-version-min=1.4'],
+            'WARNING_CXXFLAGS': ['-Wstrict-aliasing',
+                                 '-Wno-deprecated'],
+          },
         },
       },
     ],
diff --git a/o3d/build/nacl.gyp b/o3d/build/nacl.gyp
index cf77898..29304ba 100644
--- a/o3d/build/nacl.gyp
+++ b/o3d/build/nacl.gyp
@@ -14,10 +14,6 @@
       'target_name': 'build_nacl',
       'type': 'none',
       'variables': {
-        'nacl_libs': [
-          'google_nacl_imc',
-          'google_nacl_imc_c',
-        ],
         'nacl_output_dir': '<(SHARED_INTERMEDIATE_DIR)/nacl_libs',
       },
       'actions': [
@@ -37,7 +33,8 @@
             '--output="<(nacl_output_dir)"',
             '--configuration="<(CONFIGURATION)"',
             '--platform=<(OS)',
-            '<@(nacl_libs)',
+            'google_nacl_imc',
+            'google_nacl_imc_c',
           ],
         },
       ],
diff --git a/o3d/compiler/technique/technique.gyp b/o3d/compiler/technique/technique.gyp
index cd2f865..1e700b8 100644
--- a/o3d/compiler/technique/technique.gyp
+++ b/o3d/compiler/technique/technique.gyp
@@ -65,6 +65,9 @@
           'CompileAs': '2',
         },
       },
+      'xcode_settings': {
+        'OTHER_CFLAGS': ['-x', 'c++'],
+      },
     },
   ],
 }
diff --git a/o3d/converter/converter.gyp b/o3d/converter/converter.gyp
index 54fd5a1..3849b6c 100644
--- a/o3d/converter/converter.gyp
+++ b/o3d/converter/converter.gyp
@@ -63,6 +63,9 @@
             'link_settings': {
               'libraries': [
                 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+                '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework',
+                '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
+                '../../../<(cgdir)/Cg.framework',
               ],
             },
           },
diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp
index 0a47131..4e14c88 100644
--- a/o3d/core/core.gyp
+++ b/o3d/core/core.gyp
@@ -21,6 +21,14 @@
           ],
         }
       ],
+      ['renderer == "gl"',
+        {
+          'include_dirs': [
+            '../../<(glewdir)/include',
+            '../../<(cgdir)/include',
+          ],
+        }
+      ],
     ],
   },
   'includes': [
@@ -35,7 +43,6 @@
         '../../<(pngdir)/libpng.gyp:libpng',
         '../../<(zlibdir)/zlib.gyp:zlib',
         '../../skia/skia.gyp:skia',
-        '../build/nacl.gyp:build_nacl',
       ],
       'sources': [
         'cross/bitmap.cc',
@@ -344,10 +351,6 @@
     {
       'target_name': 'o3dCoreTest',
       'type': 'none',
-      'dependencies': [
-        'o3dCore',
-        'o3dCorePlatform',
-      ],
       'direct_dependent_settings': {
         'sources': [
           'cross/bitmap_test.cc',
diff --git a/o3d/import/import.gyp b/o3d/import/import.gyp
index 81f75e5..2195700 100644
--- a/o3d/import/import.gyp
+++ b/o3d/import/import.gyp
@@ -88,9 +88,6 @@
     {
       'target_name': 'o3dImportTest',
       'type': 'none',
-      'dependencies': [
-        'o3dImport',
-      ],
       'direct_dependent_settings': {
         'sources': [
           'cross/tar_generator_test.cc',
diff --git a/o3d/plugin/idl/idl.gyp b/o3d/plugin/idl/idl.gyp
index 4bf9e3a..9f3a277 100644
--- a/o3d/plugin/idl/idl.gyp
+++ b/o3d/plugin/idl/idl.gyp
@@ -7,7 +7,7 @@
     '../../build/common.gypi',
   ],
   'variables': {
-    'chromium_code': 1,
+    'chromium_code': 0,
     'idl_out_dir': '<(SHARED_INTERMEDIATE_DIR)/idl_glue',
     'static_glue_dir': '../../../third_party/nixysa/files/static_glue/npapi',
     'idl_files': [
@@ -87,8 +87,6 @@
           'outputs': [
             '<(idl_out_dir)/<(RULE_INPUT_ROOT)_glue.cc',
             '<(idl_out_dir)/<(RULE_INPUT_ROOT)_glue.h',
-            '<(idl_out_dir)/globals_glue.cc',
-            '<(idl_out_dir)/globals_glue.h',
             '<(idl_out_dir)/hash',
             '<(idl_out_dir)/parsetab.py',
             '<(idl_out_dir)/parsetab.pyc',
@@ -145,6 +143,16 @@
             ],
           },
         ],
+        ['OS=="mac"',
+          {
+            'include_dirs': [
+              '../mac',
+            ],
+            'defines': [
+              'XP_MACOSX',
+            ],
+          },
+        ],
       ],
     },
   ],
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp
index 688509a..82b6ff6 100644
--- a/o3d/plugin/plugin.gyp
+++ b/o3d/plugin/plugin.gyp
@@ -187,21 +187,22 @@
                       'action': ['python',
                         'version_info.py',
                         'win/o3dPlugin.rc_template',
-                      'win/o3dPlugin.rc'],
+                        'win/o3dPlugin.rc'],
                     },
                   ],
                   ['OS=="mac"',
                     {
                       'inputs': [
-                        'mac/processed/Info.plist',
+                        'mac/Info.plist',
                       ],
                       'outputs': [
-                        'mac/Info.plist',
+                        '<(SHARED_INTERMEDIATE_DIR)/plugin/Info.plist',
                       ],
                       'action': ['python',
                         'version_info.py',
-                        'mac/processed/Info.plist',
-                      'mac/Info.plist'],
+                        'mac/Info.plist',
+                        '<(SHARED_INTERMEDIATE_DIR)/plugin/Info.plist',
+                      ],
                     },
                   ],
                 ],
diff --git a/o3d/plugin/version_info.py b/o3d/plugin/version_info.py
index bda71841..fe92026 100644
--- a/o3d/plugin/version_info.py
+++ b/o3d/plugin/version_info.py
@@ -41,7 +41,6 @@ gflags.DEFINE_boolean('mimetype', False,
 gflags.DEFINE_boolean('version', False,
                       'Print out the plugin version and exit.')
 
-
 def GetDotVersion(version):
   return '%d.%d.%d.%d' % version
 
@@ -51,7 +50,7 @@ def GetCommaVersion(version):
 def DoReplace(in_filename, out_filename, replacements):
   '''Replace the version number in the given filename with the replacements.'''
   if not os.path.exists(in_filename):
-    raise Exception(r'''Input template file %s doesn't exist.''' % file)
+    raise Exception(r'''Input template file %s doesn't exist.''' % in_filename)
   input_file = open(in_filename, 'r')
   input = input_file.read()
   input_file.close()
diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp
index c55befe..d1e497bc 100644
--- a/o3d/tests/tests.gyp
+++ b/o3d/tests/tests.gyp
@@ -30,7 +30,10 @@
         '../../testing/gtest.gyp:gtest',
         '../build/nacl.gyp:build_nacl',
         '../compiler/technique/technique.gyp:technique',
+        '../core/core.gyp:o3dCore',
+        '../core/core.gyp:o3dCorePlatform',
         '../core/core.gyp:o3dCoreTest',
+        '../import/import.gyp:o3dImport',
         '../import/archive.gyp:o3dArchiveTest',
         '../import/import.gyp:o3dImportTest',
         '../serializer/serializer.gyp:o3dSerializerTest',