| OLD | NEW |
| 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 | 5 |
| 6 { | 6 { |
| 7 'targets': [ | 7 'targets': [ |
| 8 { | 8 { |
| 9 'target_name': 'pepper_test_plugin', | 9 'target_name': 'pepper_test_plugin', |
| 10 'dependencies': [ | 10 'dependencies': [ |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 # -gstabs, used in the official builds, causes an ICE. Simply remove | 51 # -gstabs, used in the official builds, causes an ICE. Simply remove |
| 52 # it. | 52 # it. |
| 53 'cflags!': ['-gstabs'], | 53 'cflags!': ['-gstabs'], |
| 54 }], | 54 }], |
| 55 ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_f
pic!=1', { | 55 ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_f
pic!=1', { |
| 56 'product_name': 'pepper_test_plugin', | 56 'product_name': 'pepper_test_plugin', |
| 57 # Shared libraries need -fPIC on x86-64 | 57 # Shared libraries need -fPIC on x86-64 |
| 58 'cflags': ['-fPIC'], | 58 'cflags': ['-fPIC'], |
| 59 'defines': ['INDEPENDENT_PLUGIN'], | 59 'defines': ['INDEPENDENT_PLUGIN'], |
| 60 }, { | 60 }, { |
| 61 # Dependencies for all other OS/CPU combinations except the Linux ones
above |
| 61 'dependencies': [ | 62 'dependencies': [ |
| 62 '../../../base/base.gyp:base', | 63 '../../../base/base.gyp:base', |
| 63 '../../../skia/skia.gyp:skia', | 64 '../../../skia/skia.gyp:skia', |
| 65 '../../../gpu/gpu.gyp:gles2_demo_lib', |
| 66 '../../../gpu/gpu.gyp:pgl', |
| 64 ], | 67 ], |
| 65 'conditions': [ | |
| 66 ['OS!="mac"', { | |
| 67 'dependencies': [ | |
| 68 '../../../gpu/gpu.gyp:gles2_demo_lib', | |
| 69 '../../../gpu/gpu.gyp:pgl', | |
| 70 ], | |
| 71 }], | |
| 72 ] | |
| 73 }], | 68 }], |
| 74 ['OS=="mac"', { | 69 ['OS=="mac"', { |
| 75 'type': 'loadable_module', | 70 'type': 'loadable_module', |
| 76 'mac_bundle': 1, | 71 'mac_bundle': 1, |
| 77 'product_name': 'PepperTestPlugin', | 72 'product_name': 'PepperTestPlugin', |
| 78 'product_extension': 'plugin', | 73 'product_extension': 'plugin', |
| 79 'defines': ['INDEPENDENT_PLUGIN'], | |
| 80 'sources+': [ | 74 'sources+': [ |
| 81 'Info.plist' | 75 'Info.plist' |
| 82 ], | 76 ], |
| 83 }], | 77 }], |
| 84 ], | 78 ], |
| 85 # See README for instructions on how to run and debug on the Mac. | 79 # See README for instructions on how to run and debug on the Mac. |
| 86 #'conditions' : [ | 80 #'conditions' : [ |
| 87 # ['OS=="mac"', { | 81 # ['OS=="mac"', { |
| 88 # 'target_name' : 'Chromium', | 82 # 'target_name' : 'Chromium', |
| 89 # 'type' : 'executable', | 83 # 'type' : 'executable', |
| 90 # 'xcode_settings' : { | 84 # 'xcode_settings' : { |
| 91 # 'ARGUMENTS' : '--renderer-startup-dialog --internal-pepper --no-san
dbox file://${SRCROOT}/test_page.html' | 85 # 'ARGUMENTS' : '--renderer-startup-dialog --internal-pepper --no-san
dbox file://${SRCROOT}/test_page.html' |
| 92 # }, | 86 # }, |
| 93 # }], | 87 # }], |
| 94 #], | 88 #], |
| 95 }, | 89 }, |
| 96 ], | 90 ], |
| 97 } | 91 } |
| OLD | NEW |