OLD | NEW |
1 # -*- python -*- | 1 # -*- python -*- |
2 # Copyright 2010 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # be 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/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 if not env.Bit('bitcode'): |
| 21 env.Append(CCFLAGS=['-mtls-use-call']) |
20 | 22 |
21 # The PPAPI RPCs are specified abstractly via .srpc files. | 23 # The PPAPI RPCs are specified abstractly via .srpc files. |
22 # Once a .srpc file is added to the UntrustedSrpc rules below, the low-level | 24 # 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 | 25 # server/client proxies and stubs can be generated automatically using |
24 # scons --mode=nacl_extra_sdk srpcgen | 26 # scons --mode=nacl_extra_sdk srpcgen |
25 # The .cc files are written to ./ and .h files - to ./untrusted/srpcgen/. | 27 # The .cc files are written to ./ and .h files - to ./untrusted/srpcgen/. |
26 # The generated files must be committed when changes are made to .srpc files. | 28 # The generated files must be committed when changes are made to .srpc files. |
27 | 29 |
28 env.UntrustedSrpc(is_client=False, | 30 env.UntrustedSrpc(is_client=False, |
29 srpc_files=['objectstub.srpc', | 31 srpc_files=['objectstub.srpc', |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 'ppb_rpc_client.cc', | 128 'ppb_rpc_client.cc', |
127 'upcall_client.cc' | 129 'upcall_client.cc' |
128 ] + command_buffer_srcs) | 130 ] + command_buffer_srcs) |
129 | 131 |
130 env.Depends('ppruntime', 'srpc_untrusted') | 132 env.Depends('ppruntime', 'srpc_untrusted') |
131 header_install = env.AddHeaderToSdk(['ppruntime.h']) | 133 header_install = env.AddHeaderToSdk(['ppruntime.h']) |
132 env.AddLibraryToSdk(['ppruntime']) | 134 env.AddLibraryToSdk(['ppruntime']) |
133 | 135 |
134 # Clients that overload main() will use ppruntime.h. | 136 # Clients that overload main() will use ppruntime.h. |
135 env.Requires('ppruntime', header_install) | 137 env.Requires('ppruntime', header_install) |
OLD | NEW |