summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mapi/glapi/gen/SConscript16
-rw-r--r--src/mesa/SConscript17
2 files changed, 15 insertions, 18 deletions
diff --git a/src/mapi/glapi/gen/SConscript b/src/mapi/glapi/gen/SConscript
index 18158ff8b10..e4abe906a4d 100644
--- a/src/mapi/glapi/gen/SConscript
+++ b/src/mapi/glapi/gen/SConscript
@@ -44,6 +44,20 @@ env.CodeGenerate(
env.CodeGenerate(
target = '../../../mesa/main/remap_helper.h',
script = 'remap_helper.py',
- source = 'gl_and_es_API.xml',
+ source = sources,
+ command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
+ )
+
+env.CodeGenerate(
+ target = '../../../mesa/main/enums.c',
+ script = 'gl_enums.py',
+ source = sources,
+ command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
+ )
+
+env.CodeGenerate(
+ target = '../../../mesa/main/api_exec.c',
+ script = 'gl_genexec.py',
+ source = sources,
command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
)
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 0f1543802b9..d328fc13c48 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -417,23 +417,6 @@ if (env['gcc'] or env['clang']) and \
env.Append(CPPPATH = [matypes[0].dir])
-# The enums.c file is generated from the GL/ES API.xml file
-env.CodeGenerate(
- target = 'main/enums.c',
- script = GLAPI + 'gen/gl_enums.py',
- source = GLAPI + 'gen/gl_and_es_API.xml',
- command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
- )
-
-# The api_exec.c file is generated from the GL/ES API.xml file
-env.CodeGenerate(
- target = 'main/api_exec.c',
- script = GLAPI + 'gen/gl_genexec.py',
- source = GLAPI + 'gen/gl_and_es_API.xml',
- command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
- )
-
-
def write_git_sha1_h_file(filename):
"""Mesa looks for a git_sha1.h file at compile time in order to display
the current git hash id in the GL_VERSION string. This function tries