Enable building ppapi/examples on Mac.

BUG=54005
TEST=build and run the examples on Mac (try both debug and release build)


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

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

2 files changed, 155 insertions, 151 deletions

diff --git a/ppapi/ppapi_gl.gypi b/ppapi/ppapi_gl.gypi
index e9664de..6830e72 100644
--- a/ppapi/ppapi_gl.gypi
+++ b/ppapi/ppapi_gl.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
@@ -32,8 +32,11 @@
           ],
         }],
         ['OS=="mac"', {
-          # TODO(alokp): Make this compile on mac.
           'suppress_wildcard': 1,
+          'xcode_settings': {
+            # Suppress warnings in third party mesa_egl code.
+            'WARNING_CFLAGS': ['-Wno-sign-compare']
+          }
         }],
       ],
       'sources': [
diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi
index b6d8b02..9b17c5d 100644
--- a/ppapi/ppapi_tests.gypi
+++ b/ppapi/ppapi_tests.gypi
@@ -246,6 +246,15 @@
           }],
           ['OS=="mac"', {
             'type': 'loadable_module',
+            'mac_bundle': 1,
+            'product_extension': 'plugin',
+            'xcode_settings': {
+              'OTHER_LDFLAGS': [
+                # Not to strip important symbols by -Wl,-dead_strip.
+                '-Wl,-exported_symbol,_PPP_GetInterface',
+                '-Wl,-exported_symbol,_PPP_InitializeModule',
+                '-Wl,-exported_symbol,_PPP_ShutdownModule'
+              ]},
           }],
         ],
       },
@@ -260,155 +269,147 @@
         'examples/mouse_lock/mouse_lock.cc',
       ],
     },
-  ],
 
-  'conditions': [
-    # NOTE: the PPAPI examples fail to build on mac & windows.
-    # http://code.google.com/p/chromium/issues/detail?id=54005 tracks mac.
-    ['OS!="mac"', {
-      'targets': [
-        {
-          'target_name': 'ppapi_example_c_stub',
-          'dependencies': [
-            'ppapi_example_skeleton',
-            'ppapi.gyp:ppapi_c',
-          ],
-          'sources': [
-            'examples/stub/stub.c',
-          ],
-        },
-        {
-          'target_name': 'ppapi_example_cc_stub',
-          'dependencies': [
-            'ppapi_example_skeleton',
-            'ppapi.gyp:ppapi_cpp',
-          ],
-          'sources': [
-            'examples/stub/stub.cc',
-          ],
-        },
-        {
-          'target_name': 'ppapi_example_audio',
-          'dependencies': [
-            'ppapi_example_skeleton',
-            'ppapi.gyp:ppapi_cpp',
-          ],
-          'sources': [
-            'examples/audio/audio.cc',
-          ],
-        },
-        {
-          'target_name': 'ppapi_example_file_chooser',
-          'dependencies': [
-            'ppapi_example_skeleton',
-            'ppapi.gyp:ppapi_cpp',
-          ],
-          'sources': [
-            'examples/file_chooser/file_chooser.cc',
-          ],
-        },
-        {
-          'target_name': 'ppapi_example_graphics_2d',
-          'dependencies': [
-            'ppapi_example_skeleton',
-            'ppapi.gyp:ppapi_c',
-          ],
-          'sources': [
-            'examples/2d/graphics_2d_example.c',
-          ],
-        },
-        {
-          'target_name': 'ppapi_example_ime',
-          'dependencies': [
-            'ppapi_example_skeleton',
-            'ppapi.gyp:ppapi_cpp',
-          ],
-          'sources': [
-            'examples/ime/ime.cc',
-          ],
-        },
-        {
-          'target_name': 'ppapi_example_paint_manager',
-          'dependencies': [
-            'ppapi_example_skeleton',
-            'ppapi.gyp:ppapi_cpp',
-          ],
-          'sources': [
-            'examples/2d/paint_manager_example.cc',
-          ],
-        },
-        {
-          'target_name': 'ppapi_example_post_message',
-          'dependencies': [
-            'ppapi_example_skeleton',
-            'ppapi.gyp:ppapi_cpp',
-          ],
-          'sources': [
-            'examples/scripting/post_message.cc',
-          ],
-        },
-        {
-          'target_name': 'ppapi_example_scroll',
-          'dependencies': [
-            'ppapi_example_skeleton',
-            'ppapi.gyp:ppapi_cpp',
-          ],
-          'sources': [
-            'examples/2d/scroll.cc',
-          ],
-        },
-        {
-          'target_name': 'ppapi_example_simple_font',
-          'dependencies': [
-            'ppapi_example_skeleton',
-            'ppapi.gyp:ppapi_cpp',
-          ],
-          'sources': [
-            'examples/font/simple_font.cc',
-          ],
-        },
-        {
-          'target_name': 'ppapi_example_url_loader',
-          'dependencies': [
-            'ppapi_example_skeleton',
-            'ppapi.gyp:ppapi_cpp',
-          ],
-          'sources': [
-            'examples/url_loader/streaming.cc',
-          ],
-        },
-        {
-          'target_name': 'ppapi_example_gles2',
-          'dependencies': [
-            'ppapi_example_skeleton',
-            'ppapi.gyp:ppapi_cpp',
-            'ppapi.gyp:ppapi_gles2',
-            'ppapi.gyp:ppapi_egl',
-          ],
-          'include_dirs': [
-            'lib/gl/include',
-          ],
-          'sources': [
-            'examples/gles2/gles2.cc',
-            'examples/gles2/testdata.h',
-          ],
-        },
-        {
-          'target_name': 'ppapi_example_vc',
-          'dependencies': [
-            'ppapi_example_skeleton',
-            'ppapi.gyp:ppapi_cpp',
-            'ppapi.gyp:ppapi_gles2',
-            'ppapi.gyp:ppapi_egl',
-          ],
-          'include_dirs': [
-            'lib/gl/include',
-          ],
-          'sources': [
-            'examples/video_capture/video_capture.cc',
-          ],
-        },
+    {
+      'target_name': 'ppapi_example_c_stub',
+      'dependencies': [
+        'ppapi_example_skeleton',
+        'ppapi.gyp:ppapi_c',
+      ],
+      'sources': [
+        'examples/stub/stub.c',
+      ],
+    },
+    {
+      'target_name': 'ppapi_example_cc_stub',
+      'dependencies': [
+        'ppapi_example_skeleton',
+        'ppapi.gyp:ppapi_cpp',
+      ],
+      'sources': [
+        'examples/stub/stub.cc',
+      ],
+    },
+    {
+      'target_name': 'ppapi_example_audio',
+      'dependencies': [
+        'ppapi_example_skeleton',
+        'ppapi.gyp:ppapi_cpp',
+      ],
+      'sources': [
+        'examples/audio/audio.cc',
+      ],
+    },
+    {
+      'target_name': 'ppapi_example_file_chooser',
+      'dependencies': [
+        'ppapi_example_skeleton',
+        'ppapi.gyp:ppapi_cpp',
+      ],
+      'sources': [
+        'examples/file_chooser/file_chooser.cc',
+      ],
+    },
+    {
+      'target_name': 'ppapi_example_graphics_2d',
+      'dependencies': [
+        'ppapi_example_skeleton',
+        'ppapi.gyp:ppapi_c',
+      ],
+      'sources': [
+        'examples/2d/graphics_2d_example.c',
+      ],
+    },
+    {
+      'target_name': 'ppapi_example_ime',
+      'dependencies': [
+        'ppapi_example_skeleton',
+        'ppapi.gyp:ppapi_cpp',
+      ],
+      'sources': [
+        'examples/ime/ime.cc',
+      ],
+    },
+    {
+      'target_name': 'ppapi_example_paint_manager',
+      'dependencies': [
+        'ppapi_example_skeleton',
+        'ppapi.gyp:ppapi_cpp',
+      ],
+      'sources': [
+        'examples/2d/paint_manager_example.cc',
       ],
-    }]
-  ]
+    },
+    {
+      'target_name': 'ppapi_example_post_message',
+      'dependencies': [
+        'ppapi_example_skeleton',
+        'ppapi.gyp:ppapi_cpp',
+      ],
+      'sources': [
+        'examples/scripting/post_message.cc',
+      ],
+    },
+    {
+      'target_name': 'ppapi_example_scroll',
+      'dependencies': [
+        'ppapi_example_skeleton',
+        'ppapi.gyp:ppapi_cpp',
+      ],
+      'sources': [
+        'examples/2d/scroll.cc',
+      ],
+    },
+    {
+      'target_name': 'ppapi_example_simple_font',
+      'dependencies': [
+        'ppapi_example_skeleton',
+        'ppapi.gyp:ppapi_cpp',
+      ],
+      'sources': [
+        'examples/font/simple_font.cc',
+      ],
+    },
+    {
+      'target_name': 'ppapi_example_url_loader',
+      'dependencies': [
+        'ppapi_example_skeleton',
+        'ppapi.gyp:ppapi_cpp',
+      ],
+      'sources': [
+        'examples/url_loader/streaming.cc',
+      ],
+    },
+    {
+      'target_name': 'ppapi_example_gles2',
+      'dependencies': [
+        'ppapi_example_skeleton',
+        'ppapi.gyp:ppapi_cpp',
+        'ppapi.gyp:ppapi_gles2',
+        'ppapi.gyp:ppapi_egl',
+      ],
+      'include_dirs': [
+        'lib/gl/include',
+      ],
+      'sources': [
+        'examples/gles2/gles2.cc',
+        'examples/gles2/testdata.h',
+      ],
+    },
+    {
+      'target_name': 'ppapi_example_vc',
+      'dependencies': [
+        'ppapi_example_skeleton',
+        'ppapi.gyp:ppapi_cpp',
+        'ppapi.gyp:ppapi_gles2',
+        'ppapi.gyp:ppapi_egl',
+      ],
+      'include_dirs': [
+        'lib/gl/include',
+      ],
+      'sources': [
+        'examples/video_capture/video_capture.cc',
+      ],
+    },
+  ],
 }