Mesa (master): mapi: Fix enums.c build with other build systems.
Eric Anholt
anholt at kemper.freedesktop.org
Tue Dec 1 20:19:37 UTC 2015
Module: Mesa
Branch: master
Commit: 148c2f5b175eb0c6355d9f1fc4a60c2f7013535d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=148c2f5b175eb0c6355d9f1fc4a60c2f7013535d
Author: Eric Anholt <eric at anholt.net>
Date: Tue Dec 1 12:01:53 2015 -0800
mapi: Fix enums.c build with other build systems.
Tested with scons (by both myself and Mark Janes), Android is just copy
and paste.
---
src/mapi/glapi/gen/SConscript | 2 +-
src/mesa/Android.gen.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mapi/glapi/gen/SConscript b/src/mapi/glapi/gen/SConscript
index b9cdbbf..ff0df74 100644
--- a/src/mapi/glapi/gen/SConscript
+++ b/src/mapi/glapi/gen/SConscript
@@ -51,7 +51,7 @@ env.CodeGenerate(
env.CodeGenerate(
target = '../../../mesa/main/enums.c',
script = 'gl_enums.py',
- source = sources,
+ source = '../registry/gl.xml',
command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
)
diff --git a/src/mesa/Android.gen.mk b/src/mesa/Android.gen.mk
index 145f259..a985f0a 100644
--- a/src/mesa/Android.gen.mk
+++ b/src/mesa/Android.gen.mk
@@ -102,7 +102,7 @@ $(intermediates)/main/remap_helper.h: $(dispatch_deps)
$(call es-gen, $*)
$(intermediates)/main/enums.c: PRIVATE_SCRIPT :=$(MESA_PYTHON2) $(glapi)/gl_enums.py
-$(intermediates)/main/enums.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml
+$(intermediates)/main/enums.c: PRIVATE_XML := -f $(glapi)/../registry/gl.xml
$(intermediates)/main/enums.c: $(dispatch_deps)
$(call es-gen)
More information about the mesa-commit
mailing list