summaryrefslogtreecommitdiffstats
path: root/src/mesa/SConscript
diff options
context:
space:
mode:
authorChia-I Wu <[email protected]>2011-06-08 22:24:32 +0800
committerChia-I Wu <[email protected]>2011-06-08 23:19:01 +0800
commit4bb748b609288205ddea750550185d7642025bff (patch)
tree30b031eaaccb8ee29b25ffad9916422706377f9b /src/mesa/SConscript
parent0dc45374f2c62e33680f3a5729a18ba9ee40cd4d (diff)
mesa: merge glapidispatch.h into dispatch.h
glapidispatch.h was located in glapi and shared with mesa core. Because the way it was shared, mesa core must include it indirectly via main/dispatch.h. Now that it is no longer needed by glapi and is located in core mesa, merging it with main/dispatch.h to avoid wrong uses.
Diffstat (limited to 'src/mesa/SConscript')
-rw-r--r--src/mesa/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 2d8a17727c5..fdb4d5a5814 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -346,7 +346,7 @@ if env['gles']:
GLAPI = '#src/mapi/glapi/'
gles_headers = []
gles_headers += env.CodeGenerate(
- target = 'es1api/main/glapidispatch.h',
+ target = 'es1api/main/dispatch.h',
script = GLAPI + 'gen/gl_table.py',
source = GLAPI + 'gen-es/es1_API.xml',
command = python_cmd + ' $SCRIPT -c -m remap_table -f $SOURCE > $TARGET',
@@ -358,7 +358,7 @@ if env['gles']:
command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET',
)
gles_headers += env.CodeGenerate(
- target = 'es2api/main/glapidispatch.h',
+ target = 'es2api/main/dispatch.h',
script = GLAPI + 'gen/gl_table.py',
source = GLAPI + 'gen-es/es2_API.xml',
command = python_cmd + ' $SCRIPT -c -m remap_table -f $SOURCE > $TARGET',