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

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

Issue 10290006: Update gl2.h and gl2ext.h headers from Khronos. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 2011 The Native Client Authors. All rights reserved. 2 # Copyright 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
4 # be found in the LICENSE file. 4 # be found in the LICENSE file.
5 5
6 import os 6 import os
7 import gyp_extract 7 import gyp_extract
8 8
9 Import('env') 9 Import('env')
10 10
(...skipping 21 matching lines...) Expand all
32 ppapi_cpp_gypi, 'ppapi_cpp', '.*\.cc') 32 ppapi_cpp_gypi, 'ppapi_cpp', '.*\.cc')
33 ) 33 )
34 libppapi_cpp = env.NaClSdkLibrary('libppapi_cpp', cpp_sources) 34 libppapi_cpp = env.NaClSdkLibrary('libppapi_cpp', cpp_sources)
35 env.AddLibraryToSdk(libppapi_cpp) 35 env.AddLibraryToSdk(libppapi_cpp)
36 36
37 env.Append(CPPPATH=[ 37 env.Append(CPPPATH=[
38 '$SOURCE_ROOT/ppapi/lib/gl/gles2', 38 '$SOURCE_ROOT/ppapi/lib/gl/gles2',
39 '$SOURCE_ROOT/ppapi/lib/gl/include', 39 '$SOURCE_ROOT/ppapi/lib/gl/include',
40 ]) 40 ])
41 41
42 env.Prepend(CPPDEFINES=['GL_GLEXT_PROTOTYPES'])
43
42 # Load ppapi_gl.gypi 44 # Load ppapi_gl.gypi
43 ppapi_gl_gypi = gyp_extract.LoadGypFile( 45 ppapi_gl_gypi = gyp_extract.LoadGypFile(
44 env.File('$SOURCE_ROOT/ppapi/ppapi_gl.gypi').abspath) 46 env.File('$SOURCE_ROOT/ppapi/ppapi_gl.gypi').abspath)
45 47
46 # From ppapi_gl.gypi:ppapi_gles2:.*\.c 48 # From ppapi_gl.gypi:ppapi_gles2:.*\.c
47 gles2_sources = gyp_extract.GypTargetSources( 49 gles2_sources = gyp_extract.GypTargetSources(
48 ppapi_gl_gypi, 'ppapi_gles2', '.*\.c') 50 ppapi_gl_gypi, 'ppapi_gles2', '.*\.c')
49 libppapi_gles2 = env.NaClSdkLibrary('libppapi_gles2', gles2_sources) 51 libppapi_gles2 = env.NaClSdkLibrary('libppapi_gles2', gles2_sources)
50 52
51 env.AddLibraryToSdk(libppapi_gles2) 53 env.AddLibraryToSdk(libppapi_gles2)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698