summaryrefslogtreecommitdiffstats
path: root/src/mesa/SConscript
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2013-04-17 09:49:39 -0600
committerBrian Paul <[email protected]>2013-04-17 17:33:40 -0600
commit815ca0bf38de89cff533a413066a7e23a0aa5fb0 (patch)
tree46589e04f080897905809da8d014ca5e94a82eeb /src/mesa/SConscript
parent9835d9059683e285dc925801c4c98ea9bfc2ffb8 (diff)
mesa: generate glGetInteger/Boolean/Float/Doublev() code for all APIs
No longer pass -a flag to the get_hash_generate.py script to specify OpenGL, ES1, ES2, etc. This updates the autoconf, scons and android build files too (so we can bisect). This is the last of the API-dependent conditional compilation in core Mesa. Reviewed-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src/mesa/SConscript')
-rw-r--r--src/mesa/SConscript7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index a61b4759be3..3cd0f87ef5f 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -341,16 +341,11 @@ if env['gles']:
enabled_apis += ['ES1', 'ES2']
-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'
+ command = python_cmd + ' $SCRIPT ' + ' -f $SOURCE > $TARGET'
)
#