Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ppapi/ppapi_tests.gypi

Issue 8551001: Enable building ppapi/examples on Mac. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/ppapi_gl.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/ppapi_tests.gypi
diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi
index 352cfd1feac718e5921ceda667f0a05378bb3767..53e766254dcdf9a2107ef4f9b8a2b539899a43b2 100644
--- a/ppapi/ppapi_tests.gypi
+++ b/ppapi/ppapi_tests.gypi
@@ -244,6 +244,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'
+ ]},
}],
],
},
@@ -258,155 +267,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',
+ ],
+ },
+ ],
}
« no previous file with comments | « ppapi/ppapi_gl.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698