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

Side by Side Diff: ppapi/native_client/tests/ppapi_example_gles2/nacl.scons

Issue 10868029: Inlining PPAPI_LIBS as its now the same everywhere. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 4 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
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2012 The Native Client 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 # This is a Pepper 3D (OpenGLES2) example from ppapi/examples/gles2. 6 # This is a Pepper 3D (OpenGLES2) example from ppapi/examples/gles2.
7 7
8 Import('env') 8 Import('env')
9 9
10 env.Prepend(CPPDEFINES=['XP_UNIX']) 10 env.Prepend(CPPDEFINES=['XP_UNIX'])
11 env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include']) 11 env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include'])
12 env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' + 12 env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
13 'ppapi_example_gles2/') 13 'ppapi_example_gles2/')
14 14
15 nexe_name = env.ProgramNameForNmf('ppapi_example_gles2') 15 nexe_name = env.ProgramNameForNmf('ppapi_example_gles2')
16 obj = env.ComponentObject( 16 obj = env.ComponentObject(
17 'gles2', 17 'gles2',
18 '$SOURCE_ROOT/ppapi/examples/gles2/gles2.cc' 18 '$SOURCE_ROOT/ppapi/examples/gles2/gles2.cc'
19 ) 19 )
20 nexe = env.ComponentProgram(nexe_name, [obj], 20 nexe = env.ComponentProgram(nexe_name, [obj],
21 EXTRA_LIBS=['${PPAPI_LIBS}', 'ppapi_cpp']) 21 EXTRA_LIBS=['ppapi', 'ppapi_cpp'])
22 22
23 # Note that the html is required to run this program. 23 # Note that the html is required to run this program.
24 env.Publish(nexe_name, 'run', 24 env.Publish(nexe_name, 'run',
25 ['ppapi_example_gles2.html']) 25 ['ppapi_example_gles2.html'])
26 26
27 test = env.PPAPIBrowserTester('ppapi_example_gles2_test.out', 27 test = env.PPAPIBrowserTester('ppapi_example_gles2_test.out',
28 url='ppapi_example_gles2.html', 28 url='ppapi_example_gles2.html',
29 nmf_names=['ppapi_example_gles2'], 29 nmf_names=['ppapi_example_gles2'],
30 files=env.ExtractPublishedFiles(nexe_name), 30 files=env.ExtractPublishedFiles(nexe_name),
31 args=['--enable_experimental_js']) 31 args=['--enable_experimental_js'])
32 32
33 env.AddNodeToTestSuite(test, 33 env.AddNodeToTestSuite(test,
34 ['chrome_browser_tests'], 34 ['chrome_browser_tests'],
35 'run_ppapi_example_gles2_test', 35 'run_ppapi_example_gles2_test',
36 # TODO(cstefansen): When fixed set to 36 # TODO(cstefansen): When fixed set to
37 # env.PPAPIBrowserTesterIsBroken(). 37 # env.PPAPIBrowserTesterIsBroken().
38 # code.google.com/p/nativeclient/issues/detail?id=1936 38 # code.google.com/p/nativeclient/issues/detail?id=1936
39 is_broken=env.Bit('nacl_glibc')) 39 is_broken=env.Bit('nacl_glibc'))
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698