diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 08:02:14 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 08:02:14 +0100 |
| commit | 2c345c9da4dedfafe791557ca3fcf891ce26249d (patch) | |
| tree | 18dc73394bd3921415b57b5847f03a9753374e99 /mesalib/src/mesa/SConscript | |
| parent | 7c531937cfab42f2fd3233c096c409ebdd5b59af (diff) | |
| parent | 1cc98f5a48924d750fbef7ea6b05a1ba49c28589 (diff) | |
| download | vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.gz vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.bz2 vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 5 nov 2012
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/mesa/main/.gitignore
xorg-server/Xi/chgdctl.c
xorg-server/dix/getevents.c
xorg-server/hw/xwin/winprefs.c
xorg-server/os/utils.c
Diffstat (limited to 'mesalib/src/mesa/SConscript')
| -rw-r--r-- | mesalib/src/mesa/SConscript | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript index 12bb70aec..53e5ee8c2 100644 --- a/mesalib/src/mesa/SConscript +++ b/mesalib/src/mesa/SConscript @@ -339,27 +339,9 @@ if env['gles']: # generate GLES sources gles_sources = ['main/es1_conversion.c',] - gles_sources += env.CodeGenerate( - target = 'main/api_exec_es1.c', - script = 'main/es_generator.py', - source = 'main/APIspec.xml', - command = python_cmd + ' $SCRIPT -S $SOURCE -V GLES1.1 > $TARGET' - ) # generate GLES headers gles_headers = [] - gles_headers += env.CodeGenerate( - target = 'main/api_exec_es1_dispatch.h', - script = GLAPI + 'gen/gl_table.py', - source = GLAPI + 'gen/gl_and_es_API.xml', - command = python_cmd + ' $SCRIPT -c es1 -m remap_table -f $SOURCE > $TARGET', - ) - gles_headers += env.CodeGenerate( - target = 'main/api_exec_es1_remap_helper.h', - script = GLAPI + 'gen/remap_helper.py', - source = GLAPI + 'gen/gl_and_es_API.xml', - command = python_cmd + ' $SCRIPT -c es1 -f $SOURCE > $TARGET', - ) env.Depends(gles_sources, gles_headers) |