projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glapi: Move to src/mapi/.
[mesa.git]
/
src
/
mesa
/
SConscript
diff --git
a/src/mesa/SConscript
b/src/mesa/SConscript
index 690fa6d1970a64c127b18e598ecb397abd8e17f2..bf4ad6d26199846c86fa66549e49108e61c30fff 100644
(file)
--- a/
src/mesa/SConscript
+++ b/
src/mesa/SConscript
@@
-9,6
+9,7
@@
if env['platform'] != 'winddk':
env = env.Clone()
env.Append(CPPPATH = [
env = env.Clone()
env.Append(CPPPATH = [
+ '#/src/mapi',
'#/src/mesa',
])
'#/src/mesa',
])
@@
-78,7
+79,6
@@
if env['platform'] != 'winddk':
'main/polygon.c',
'main/queryobj.c',
'main/rastpos.c',
'main/polygon.c',
'main/queryobj.c',
'main/rastpos.c',
- 'main/rbadaptors.c',
'main/readpix.c',
'main/remap.c',
'main/renderbuffer.c',
'main/readpix.c',
'main/remap.c',
'main/renderbuffer.c',
@@
-248,16
+248,6
@@
if env['platform'] != 'winddk':
slang_sources
)
slang_sources
)
- glapi_sources = [
- 'glapi/glapi.c',
- 'glapi/glapi_dispatch.c',
- 'glapi/glapi_entrypoint.c',
- 'glapi/glapi_execmem.c',
- 'glapi/glapi_getproc.c',
- 'glapi/glapi_nop.c',
- 'glapi/glthread.c',
- ]
-
#
# Assembly sources
#
#
# Assembly sources
#
@@
-291,9
+281,6
@@
if env['platform'] != 'winddk':
'x86/sse_normal.S',
'x86/read_rgba_span_x86.S',
]
'x86/sse_normal.S',
'x86/read_rgba_span_x86.S',
]
- glapi_sources += [
- 'x86/glapi_x86.S',
- ]
elif gcc and env['machine'] == 'x86_64':
env.Append(CPPDEFINES = [
'USE_X86_64_ASM',
elif gcc and env['machine'] == 'x86_64':
env.Append(CPPDEFINES = [
'USE_X86_64_ASM',
@@
-302,9
+289,6
@@
if env['platform'] != 'winddk':
'x86-64/x86-64.c',
'x86-64/xform4.S',
]
'x86-64/x86-64.c',
'x86-64/xform4.S',
]
- glapi_sources += [
- 'x86-64/glapi_x86-64.S'
- ]
elif gcc and env['machine'] == 'ppc':
env.Append(CPPDEFINES = [
'USE_PPC_ASM',
elif gcc and env['machine'] == 'ppc':
env.Append(CPPDEFINES = [
'USE_PPC_ASM',
@@
-313,8
+297,6
@@
if env['platform'] != 'winddk':
mesa_sources += [
'ppc/common_ppc.c',
]
mesa_sources += [
'ppc/common_ppc.c',
]
- glapi_sources += [
- ]
elif gcc and env['machine'] == 'sparc':
mesa_sources += [
'sparc/sparc.c',
elif gcc and env['machine'] == 'sparc':
mesa_sources += [
'sparc/sparc.c',
@@
-322,9
+304,6
@@
if env['platform'] != 'winddk':
'sparc/norm.S',
'sparc/xform.S',
]
'sparc/norm.S',
'sparc/xform.S',
]
- glapi_sources += [
- 'sparc/glapi_sparc.S'
- ]
else:
pass
else:
pass
@@
-355,10
+334,3
@@
if env['platform'] != 'winddk':
source = mesa_sources,
)
Export('mesa')
source = mesa_sources,
)
Export('mesa')
-
- glapi = env.ConvenienceLibrary(
- target = 'glapi',
- source = glapi_sources,
- )
- Export('glapi')
-