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

Side by Side Diff: gpu/demos/demos.gyp

Issue 6976055: More POSIX support for Chromium, consisting mostly of broadening ifdefs. This (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 6 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/demos/framework/main_exe.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'includes': [ 6 'includes': [
7 '../../ppapi/ppapi.gypi', 7 '../../ppapi/ppapi.gypi',
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'chromium_code': 1, 10 'chromium_code': 1,
11 'conditions': [ 11 'conditions': [
12 # Pepper demos that are compiled as shared libraries need to be compiled 12 # Pepper demos that are compiled as shared libraries need to be compiled
13 # with -fPIC flag. All static libraries that these demos depend on must 13 # with -fPIC flag. All static libraries that these demos depend on must
14 # also be compiled with -fPIC flag. Setting GYP_DEFINES="linux_fpic=1" 14 # also be compiled with -fPIC flag. Setting GYP_DEFINES="linux_fpic=1"
15 # compiles everything with -fPIC. Disable pepper demos on linux/x64 15 # compiles everything with -fPIC. Disable pepper demos on linux/x64
16 # unless linux_fpic is 1. 16 # unless linux_fpic is 1.
17 ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_fpi c!=1', { 17 ['os_posix == 1 and OS != "mac" and (target_arch=="x64" or target_arch=="a rm") and linux_fpic!=1', {
18 'enable_pepper_demos%': 0, 18 'enable_pepper_demos%': 0,
19 }, { 19 }, {
20 'enable_pepper_demos%': 1, 20 'enable_pepper_demos%': 1,
21 }], 21 }],
22 ], 22 ],
23 }, 23 },
24 'targets': [ 24 'targets': [
25 { 25 {
26 'target_name': 'gpu_demo_framework', 26 'target_name': 'gpu_demo_framework',
27 'type': 'static_library', 27 'type': 'static_library',
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)', 100 '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)',
101 '--enable-accelerated-plugins', 101 '--enable-accelerated-plugins',
102 '--register-pepper-plugins=$(TargetPath);' 102 '--register-pepper-plugins=$(TargetPath);'
103 'pepper-application/x-gpu-demo', 103 'pepper-application/x-gpu-demo',
104 'file://$(ProjectDir)pepper_gpu_demo.html', 104 'file://$(ProjectDir)pepper_gpu_demo.html',
105 ], 105 ],
106 }], 106 }],
107 ], 107 ],
108 }, 108 },
109 'conditions': [ 109 'conditions': [
110 ['OS=="linux"', { 110 ['os_posix == 1 and OS != "mac"', {
111 # -gstabs, used in the official builds, causes an ICE. Remove it. 111 # -gstabs, used in the official builds, causes an ICE. Remove it.
112 'cflags!': ['-gstabs'], 112 'cflags!': ['-gstabs'],
113 }], 113 }],
114 ['OS=="mac"', { 114 ['OS=="mac"', {
115 'mac_bundle': 1, 115 'mac_bundle': 1,
116 'product_extension': 'plugin', 116 'product_extension': 'plugin',
117 }], 117 }],
118 ], 118 ],
119 }, 119 },
120 }, 120 },
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 ], 300 ],
301 }], 301 }],
302 ], 302 ],
303 } 303 }
304 304
305 # Local Variables: 305 # Local Variables:
306 # tab-width:2 306 # tab-width:2
307 # indent-tabs-mode:nil 307 # indent-tabs-mode:nil
308 # End: 308 # End:
309 # vim: set expandtab tabstop=2 shiftwidth=2: 309 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/demos/framework/main_exe.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698