diff options
| author | Christian König <[email protected]> | 2011-06-09 09:35:09 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-06-09 09:35:09 +0200 |
| commit | 003401f95c9b59471c22368b7da16fe7a951e490 (patch) | |
| tree | d21fa0197ff27b8a38bd8b1d795b74d816db8b26 /src/mesa/SConscript | |
| parent | 00b4e48560f4d576b7b1924257322f5167e58c8d (diff) | |
| parent | d302804debeed13ced27fce222110c629e55d6f9 (diff) | |
Merge remote-tracking branch 'origin/master' into pipe-video
Conflicts:
src/gallium/tests/unit/u_format_test.c
src/gallium/winsys/r600/drm/r600_hw_context.c
Diffstat (limited to 'src/mesa/SConscript')
| -rw-r--r-- | src/mesa/SConscript | 4 |
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', |