diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-22 14:27:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-22 14:27:38 +0100 |
| commit | 7002c66cfba01e7d3b88dae498a195f78f0e83f5 (patch) | |
| tree | 2fbbd202a6a4243f0e64a8b22e22417a609ae19d /mesalib/src/mapi | |
| parent | 50c07563e17397daf040a32d8fdd3ab397e72371 (diff) | |
| parent | 470f7ca9f0be348faf2f03fc16811844c5eeffce (diff) | |
| download | vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.tar.gz vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.tar.bz2 vcxsrv-7002c66cfba01e7d3b88dae498a195f78f0e83f5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config
Conflicts:
mesalib/src/mesa/main/syncobj.c
mesalib/src/mesa/main/syncobj.h
xorg-server/hw/xwin/winconfig.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
Diffstat (limited to 'mesalib/src/mapi')
| -rw-r--r-- | mesalib/src/mapi/glapi/SConscript | 4 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/SConscript | 46 |
2 files changed, 21 insertions, 29 deletions
diff --git a/mesalib/src/mapi/glapi/SConscript b/mesalib/src/mapi/glapi/SConscript index 153374cc5..00cce3e7f 100644 --- a/mesalib/src/mapi/glapi/SConscript +++ b/mesalib/src/mapi/glapi/SConscript @@ -26,6 +26,7 @@ if env['platform'] == 'windows': env.Append(CPPPATH = [ '#/src/mapi', '#/src/mesa', + Dir('..'), # src/mapi build path ]) glapi_sources = [ @@ -103,6 +104,3 @@ glapi = env.ConvenienceLibrary( source = glapi_sources, ) Export('glapi') - - -env.Depends(glapi_sources, glapi_headers) diff --git a/mesalib/src/mapi/glapi/gen/SConscript b/mesalib/src/mapi/glapi/gen/SConscript index 353d02175..6d36248e7 100644 --- a/mesalib/src/mapi/glapi/gen/SConscript +++ b/mesalib/src/mapi/glapi/gen/SConscript @@ -7,43 +7,37 @@ from sys import executable as python_cmd # Mesa and GLX tree. Other .c and .h files are generated elsewhere # if they're only used in one place. -GLAPI = '#src/mapi/glapi/' - -glapi_headers = [] - -glapi_headers += env.CodeGenerate( - target = '#src/mesa/main/dispatch.h', - script = GLAPI + 'gen/gl_table.py', - source = GLAPI + 'gen/gl_and_es_API.xml', +env.CodeGenerate( + target = '../../../mesa/main/dispatch.h', + script = 'gl_table.py', + source = 'gl_and_es_API.xml', command = python_cmd + ' $SCRIPT -m remap_table -f $SOURCE > $TARGET', ) -glapi_headers += env.CodeGenerate( - target = '#src/mapi/glapi/glapitable.h', - script = GLAPI + 'gen/gl_table.py', - source = GLAPI + 'gen/gl_and_es_API.xml', +env.CodeGenerate( + target = '../../../mapi/glapi/glapitable.h', + script = 'gl_table.py', + source = 'gl_and_es_API.xml', command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' ) -glapi_headers += env.CodeGenerate( - target = '#src/mapi/glapi/glapitemp.h', - script = GLAPI + 'gen/gl_apitemp.py', - source = GLAPI + 'gen/gl_and_es_API.xml', +env.CodeGenerate( + target = '../../../mapi/glapi/glapitemp.h', + script = 'gl_apitemp.py', + source = 'gl_and_es_API.xml', command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' ) -glapi_headers += env.CodeGenerate( - target = '#src/mapi/glapi/glprocs.h', - script = GLAPI + 'gen/gl_procs.py', - source = GLAPI + 'gen/gl_and_es_API.xml', +env.CodeGenerate( + target = '../../../mapi/glapi/glprocs.h', + script = 'gl_procs.py', + source = 'gl_and_es_API.xml', command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' ) -glapi_headers += env.CodeGenerate( - target = '#src/mesa/main/remap_helper.h', - script = GLAPI + 'gen/remap_helper.py', - source = GLAPI + 'gen/gl_and_es_API.xml', +env.CodeGenerate( + target = '../../../mesa/main/remap_helper.h', + script = 'remap_helper.py', + source = 'gl_and_es_API.xml', command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET' ) - -env.Export('glapi_headers') |