aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/SConscript
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-11 10:09:13 +0200
committermarha <marha@users.sourceforge.net>2012-10-11 10:09:13 +0200
commit30c05ead4fe1b6a341d5b585e3a6b5d255edf650 (patch)
tree932b22aede860e3ab2efe50116ad776f81c04606 /mesalib/src/mesa/SConscript
parentac799961eb382e48c68ffda1e1a89b346eb97f81 (diff)
parent8223fb176264123c86c0d3eb845973d00fd62cc2 (diff)
downloadvcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.tar.gz
vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.tar.bz2
vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xwininfo mesa git update 11 oct 2012 Conflicts: mesalib/src/mapi/glapi/gen/glX_proto_recv.py mesalib/src/mapi/glapi/gen/glX_proto_size.py mesalib/src/mapi/glapi/gen/glX_server_table.py mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mesa/main/.gitignore
Diffstat (limited to 'mesalib/src/mesa/SConscript')
-rw-r--r--mesalib/src/mesa/SConscript27
1 files changed, 22 insertions, 5 deletions
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript
index 981908217..b7f908a9a 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -16,9 +16,8 @@ env.Append(CPPPATH = [
'#/src/mesa',
])
-env.Append(CPPDEFINES = [
- 'FEATURE_GL=1',
-])
+enabled_apis = []
+enabled_apis += ['GL']
if env['platform'] == 'windows':
env.Append(CPPDEFINES = [
@@ -78,7 +77,6 @@ main_sources = [
'main/format_pack.c',
'main/format_unpack.c',
'main/framebuffer.c',
- 'main/get.c',
'main/getstring.c',
'main/glformats.c',
'main/hash.c',
@@ -141,6 +139,10 @@ main_sources = [
'main/vtxfmt.c',
]
+glget_sources = [
+ 'main/get.c',
+]
+
math_sources = [
'math/m_debug_clip.c',
'math/m_debug_norm.c',
@@ -321,6 +323,7 @@ common_driver_sources = [
mesa_sources = (
main_sources +
+ glget_sources +
math_sources +
program_sources +
vbo_sources +
@@ -335,7 +338,7 @@ GLAPI = '#src/mapi/glapi/'
if env['gles']:
- env.Append(CPPDEFINES = ['FEATURE_ES1=1', 'FEATURE_ES2=1'])
+ enabled_apis += ['ES1', 'ES2']
# generate GLES sources
gles_sources = ['main/es1_conversion.c',]
@@ -368,6 +371,20 @@ if env['gles']:
mesa_sources += gles_sources
+env.Append(CPPDEFINES = ["FEATURE_%s=1" % api for api in enabled_apis])
+
+get_hash_gen_opts = ' '.join(["-a %s" % api for api in enabled_apis])
+
+get_hash_header = env.CodeGenerate(
+ target = 'main/get_hash.h',
+ script = 'main/get_hash_generator.py',
+ source = GLAPI + 'gen/gl_and_es_API.xml',
+ command = python_cmd + ' $SCRIPT ' + get_hash_gen_opts +
+ ' -f $SOURCE > $TARGET'
+)
+
+env.Depends(glget_sources, get_hash_header)
+
#
# Assembly sources
#