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

Side by Side Diff: ppapi/native_client/src/shared/ppapi_proxy/nacl.scons

Issue 8423038: Move GL headers from gpu to third_party/khronos (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed mac_rel build failure Created 9 years 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/gpu.gyp ('k') | ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 Import('env') 6 Import('env')
7 7
8 # Underlay $SOURCE_ROOT/gpu in this directory. 8 # Underlay $SOURCE_ROOT/gpu in this directory.
9 Dir('.').addRepository(Dir('#/../gpu')) 9 Dir('.').addRepository(Dir('#/../gpu'))
10 10
11 # To enable getting the generated include files and sources and also common and 11 # To enable getting the generated include files and sources and also common and
12 # client GPU command buffer sources. 12 # client GPU command buffer sources.
13 env.Append(CPPPATH= 13 env.Append(CPPPATH=
14 ['${SOURCE_ROOT}/native_client/src/shared/ppapi_proxy/untrusted', 14 ['${SOURCE_ROOT}/native_client/src/shared/ppapi_proxy/untrusted',
15 '$SOURCE_ROOT/gpu']) 15 '$SOURCE_ROOT/third_party/khronos', '$SOURCE_ROOT/gpu'])
16 16
17 env.Append(CPPDEFINES=['XP_UNIX']) 17 env.Append(CPPDEFINES=['XP_UNIX'])
18 env.FilterOut(CCFLAGS=['-Wswitch-enum']) 18 env.FilterOut(CCFLAGS=['-Wswitch-enum'])
19 env.Append(CCFLAGS=['-Wno-long-long']) 19 env.Append(CCFLAGS=['-Wno-long-long'])
20 20
21 # The PPAPI RPCs are specified abstractly via .srpc files. 21 # The PPAPI RPCs are specified abstractly via .srpc files.
22 # Once a .srpc file is added to the UntrustedSrpc rules below, the low-level 22 # Once a .srpc file is added to the UntrustedSrpc rules below, the low-level
23 # server/client proxies and stubs can be generated automatically using 23 # server/client proxies and stubs can be generated automatically using
24 # scons srpcgen 24 # scons srpcgen
25 # The .cc files are written to ./ and .h files - to ./untrusted/srpcgen/. 25 # The .cc files are written to ./ and .h files - to ./untrusted/srpcgen/.
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 'srpc', 175 'srpc',
176 'gio', 176 'gio',
177 'platform', 177 'platform',
178 ]) 178 ])
179 179
180 header_install = env.AddHeaderToSdk(['ppruntime.h']) 180 header_install = env.AddHeaderToSdk(['ppruntime.h'])
181 env.AddLibraryToSdk(libppruntime) 181 env.AddLibraryToSdk(libppruntime)
182 182
183 # Clients that overload main() will use ppruntime.h. 183 # Clients that overload main() will use ppruntime.h.
184 env.Requires(libppruntime, header_install) 184 env.Requires(libppruntime, header_install)
OLDNEW
« no previous file with comments | « gpu/gpu.gyp ('k') | ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698