| Index: gpu/demos/demos.gyp
|
| ===================================================================
|
| --- gpu/demos/demos.gyp (revision 77518)
|
| +++ gpu/demos/demos.gyp (working copy)
|
| @@ -57,70 +57,6 @@
|
| ],
|
| },
|
| {
|
| - 'target_name': 'gpu_demo_framework_pepper',
|
| - 'type': 'static_library',
|
| - # This target injects a bunch of source files to direct dependents.
|
| - # If the dependent is a none-type target (like all.gyp), gyp will
|
| - # generate error due to these injected source files. Workaround this
|
| - # problem by preventing it from being selected by demos.gyp:*.
|
| - # TODO(neb): remove source injection and this flag.
|
| - 'suppress_wildcard': 1,
|
| - 'dependencies': [
|
| - 'gpu_demo_framework',
|
| - '../gpu.gyp:pgl',
|
| - ],
|
| - 'include_dirs': ['../..'],
|
| - 'sources': [
|
| - 'framework/plugin.cc',
|
| - 'framework/plugin.h',
|
| - ],
|
| - 'direct_dependent_settings': {
|
| - 'include_dirs': ['../..'],
|
| - 'sources': ['framework/main_pepper.cc'],
|
| - 'run_as': {
|
| - 'conditions': [
|
| - ['OS=="mac"', {
|
| - 'action': [
|
| - '<(PRODUCT_DIR)/Chromium.app/Contents/MacOS/Chromium',
|
| - '--no-sandbox',
|
| - '--internal-pepper',
|
| - '--enable-gpu-plugin',
|
| - '--load-plugin=<(PRODUCT_DIR)/$(PRODUCT_NAME).plugin',
|
| - 'file://$(SOURCE_ROOT)/pepper_gpu_demo.html',
|
| - ],
|
| - }, { # OS != "mac"
|
| - 'action': [
|
| - '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)',
|
| - '--no-sandbox',
|
| - '--internal-pepper',
|
| - '--enable-gpu-plugin',
|
| - '--load-plugin=$(TargetPath)',
|
| - 'file://$(ProjectDir)pepper_gpu_demo.html',
|
| - ],
|
| - }],
|
| - ],
|
| - },
|
| - 'conditions': [
|
| - ['OS=="win"', {
|
| - 'sources': [
|
| - 'framework/plugin.def',
|
| - 'framework/plugin.rc',
|
| - ],
|
| - }],
|
| - ['OS=="mac"', {
|
| - 'sources': [
|
| - 'framework/Plugin_Info.plist',
|
| - ],
|
| - 'xcode_settings': {
|
| - 'INFOPLIST_FILE': 'framework/Plugin_Info.plist',
|
| - },
|
| - 'mac_bundle': 1,
|
| - 'product_extension': 'plugin',
|
| - }],
|
| - ],
|
| - },
|
| - },
|
| - {
|
| 'target_name': 'gpu_demo_framework_ppapi',
|
| 'type': 'static_library',
|
| 'dependencies': [
|
| @@ -270,90 +206,6 @@
|
| ['enable_pepper_demos==1', {
|
| 'targets': [
|
| {
|
| - 'target_name': 'hello_triangle_pepper',
|
| - 'type': 'loadable_module',
|
| - 'dependencies': [
|
| - 'gpu_demo_framework_pepper',
|
| - '../../third_party/gles2_book/gles2_book.gyp:hello_triangle',
|
| - ],
|
| - 'sources': [
|
| - 'gles2_book/example.h',
|
| - 'gles2_book/demo_hello_triangle.cc',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'mip_map_2d_pepper',
|
| - 'type': 'loadable_module',
|
| - 'dependencies': [
|
| - 'gpu_demo_framework_pepper',
|
| - '../../third_party/gles2_book/gles2_book.gyp:mip_map_2d',
|
| - ],
|
| - 'sources': [
|
| - 'gles2_book/example.h',
|
| - 'gles2_book/demo_mip_map_2d.cc',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'simple_texture_2d_pepper',
|
| - 'type': 'loadable_module',
|
| - 'dependencies': [
|
| - 'gpu_demo_framework_pepper',
|
| - '../../third_party/gles2_book/gles2_book.gyp:simple_texture_2d',
|
| - ],
|
| - 'sources': [
|
| - 'gles2_book/example.h',
|
| - 'gles2_book/demo_simple_texture_2d.cc',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'simple_texture_cubemap_pepper',
|
| - 'type': 'loadable_module',
|
| - 'dependencies': [
|
| - 'gpu_demo_framework_pepper',
|
| - '../../third_party/gles2_book/gles2_book.gyp:simple_texture_cubemap',
|
| - ],
|
| - 'sources': [
|
| - 'gles2_book/example.h',
|
| - 'gles2_book/demo_simple_texture_cubemap.cc',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'simple_vertex_shader_pepper',
|
| - 'type': 'loadable_module',
|
| - 'dependencies': [
|
| - 'gpu_demo_framework_pepper',
|
| - '../../third_party/gles2_book/gles2_book.gyp:simple_vertex_shader',
|
| - ],
|
| - 'sources': [
|
| - 'gles2_book/example.h',
|
| - 'gles2_book/demo_simple_vertex_shader.cc',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'stencil_test_pepper',
|
| - 'type': 'loadable_module',
|
| - 'dependencies': [
|
| - 'gpu_demo_framework_pepper',
|
| - '../../third_party/gles2_book/gles2_book.gyp:stencil_test',
|
| - ],
|
| - 'sources': [
|
| - 'gles2_book/example.h',
|
| - 'gles2_book/demo_stencil_test.cc',
|
| - ],
|
| - },
|
| - {
|
| - 'target_name': 'texture_wrap_pepper',
|
| - 'type': 'loadable_module',
|
| - 'dependencies': [
|
| - 'gpu_demo_framework_pepper',
|
| - '../../third_party/gles2_book/gles2_book.gyp:texture_wrap',
|
| - ],
|
| - 'sources': [
|
| - 'gles2_book/example.h',
|
| - 'gles2_book/demo_texture_wrap.cc',
|
| - ],
|
| - },
|
| - {
|
| 'target_name': 'hello_triangle_ppapi',
|
| 'type': 'loadable_module',
|
| 'variables': { 'chromium_code': 0, },
|
|
|