diff options
| -rw-r--r-- | src/glx/SConscript | 11 | ||||
| -rw-r--r-- | src/mapi/glapi/SConscript | 7 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/glx/SConscript b/src/glx/SConscript index 09e0e16861c..887ac61cf02 100644 --- a/src/glx/SConscript +++ b/src/glx/SConscript @@ -92,39 +92,40 @@ libgl = env.SharedLibrary( # used by other targets as well. GLAPI = '#src/mapi/glapi/' +sources = [GLAPI + 'gen/gl_API.xml'] + env.Glob(GLAPI + 'gen/*.xml') env.CodeGenerate( target = 'indirect.c', script = GLAPI + 'gen/glX_proto_send.py', - source = GLAPI + 'gen/gl_and_es_API.xml', + source = sources, command = python_cmd + ' $SCRIPT -f $SOURCE -m proto > $TARGET' ) env.CodeGenerate( target = 'indirect_size.c', script = GLAPI + 'gen/glX_proto_size.py', - source = GLAPI + 'gen/gl_API.xml', + source = sources, command = python_cmd + ' $SCRIPT -f $SOURCE -m size_c --only-set > $TARGET' ) env.CodeGenerate( target = 'indirect_init.c', script = GLAPI + 'gen/glX_proto_send.py', - source = GLAPI + 'gen/gl_API.xml', + source = sources, command = python_cmd + ' $SCRIPT -f $SOURCE -m init_c > $TARGET' ) env.CodeGenerate( target = 'indirect_size.h', script = GLAPI + 'gen/glX_proto_size.py', - source = GLAPI + 'gen/gl_API.xml', + source = sources, command = python_cmd + ' $SCRIPT -f $SOURCE -m size_h --only-set -h _INDIRECT_SIZE_H > $TARGET' ) env.CodeGenerate( target = 'indirect.h', script = GLAPI + 'gen/glX_proto_send.py', - source = GLAPI + 'gen/gl_API.xml', + source = sources, command = python_cmd + ' $SCRIPT -m init_h -f $SOURCE > $TARGET', ) diff --git a/src/mapi/glapi/SConscript b/src/mapi/glapi/SConscript index c4ac080aaa8..152818d223f 100644 --- a/src/mapi/glapi/SConscript +++ b/src/mapi/glapi/SConscript @@ -52,6 +52,7 @@ for s in mapi_sources: if (env['gcc'] or env['clang']) and \ env['platform'] not in ('cygwin', 'darwin', 'windows'): GLAPI = '#src/mapi/glapi/' + sources = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml') if env['machine'] == 'x86': env.Append(CPPDEFINES = [ @@ -63,7 +64,7 @@ if (env['gcc'] or env['clang']) and \ env.CodeGenerate( target = 'glapi_x86.S', script = GLAPI + 'gen/gl_x86_asm.py', - source = GLAPI + 'gen/gl_and_es_API.xml', + source = sources, command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' ) elif env['machine'] == 'x86_64': @@ -76,7 +77,7 @@ if (env['gcc'] or env['clang']) and \ env.CodeGenerate( target = 'glapi_x86-64.S', script = GLAPI + 'gen/gl_x86-64_asm.py', - source = GLAPI + 'gen/gl_and_es_API.xml', + source = sources, command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' ) elif env['machine'] == 'sparc': @@ -89,7 +90,7 @@ if (env['gcc'] or env['clang']) and \ env.CodeGenerate( target = 'glapi_sparc.S', script = GLAPI + 'gen/gl_SPARC_asm.py', - source = GLAPI + 'gen/gl_and_es_API.xml', + source = sources, command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' ) else: |