projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vulkan/wsi: include builddir for generated headers
[mesa.git]
/
src
/
mapi
/
shared-glapi
/
SConscript
diff --git
a/src/mapi/shared-glapi/SConscript
b/src/mapi/shared-glapi/SConscript
index f17a4dd892a733ed400fb1d66f850a8dbc731ac5..e5d45db5949c4a58c867b628706a237fe36afc1d 100644
(file)
--- a/
src/mapi/shared-glapi/SConscript
+++ b/
src/mapi/shared-glapi/SConscript
@@
-8,8
+8,14
@@
Import('*')
def mapi_objects(env, printer, mode):
"""Return mapi objects built for the given printer and mode."""
mapi_sources = {
def mapi_objects(env, printer, mode):
"""Return mapi objects built for the given printer and mode."""
mapi_sources = {
- 'glapi': ['entry.c', 'mapi_glapi.c', 'stub.c', 'table.c',
- 'u_current.c', 'u_execmem.c', 'u_thread.c'],
+ 'glapi': [
+ 'entry.c',
+ 'mapi_glapi.c',
+ 'stub.c',
+ 'table.c',
+ 'u_current.c',
+ 'u_execmem.c',
+ ],
'bridge': ['entry.c'],
}
mapi_defines = {
'bridge': ['entry.c'],
}
mapi_defines = {
@@
-20,10
+26,11
@@
def mapi_objects(env, printer, mode):
header_name = '%s-tmp.h' % (printer)
# generate ABI header
header_name = '%s-tmp.h' % (printer)
# generate ABI header
+ GLAPI = '../glapi/'
header = env.CodeGenerate(
target = header_name,
header = env.CodeGenerate(
target = header_name,
- script = '../mapi
/mapi
_abi.py',
- source =
'../glapi/gen/gl_and_es_API.xml'
,
+ script = '../mapi_abi.py',
+ source =
[GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml')
,
command = python_cmd + ' $SCRIPT ' + \
'--printer %s --mode lib $SOURCE > $TARGET' % (printer),
)
command = python_cmd + ' $SCRIPT ' + \
'--printer %s --mode lib $SOURCE > $TARGET' % (printer),
)
@@
-31,9
+38,10
@@
def mapi_objects(env, printer, mode):
cpppath = [
header[0].dir,
'#/include',
cpppath = [
header[0].dir,
'#/include',
+ '#/src',
'#/src/mapi',
]
'#/src/mapi',
]
-
+
cppdefines = mapi_defines[mode] + [
'MAPI_ABI_HEADER=\\"%s\\"' % (header_name),
]
cppdefines = mapi_defines[mode] + [
'MAPI_ABI_HEADER=\\"%s\\"' % (header_name),
]
@@
-53,7
+61,7
@@
def mapi_objects(env, printer, mode):
for s in mapi_sources[mode]:
o = env.SharedObject(
target = '%s-%s' % (printer, s[:-2]),
for s in mapi_sources[mode]:
o = env.SharedObject(
target = '%s-%s' % (printer, s[:-2]),
- source = '../
mapi/
' + s,
+ source = '../' + s,
CPPPATH = cpppath,
CPPDEFINES = cppdefines,
)
CPPPATH = cpppath,
CPPDEFINES = cppdefines,
)