diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-18 09:29:58 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-18 09:29:58 +0100 |
| commit | 72ba71645132923bb8e0b93f7683aef8bc485aa2 (patch) | |
| tree | baeaeff7e7ce5bf65f056625b435b8d55d4a04fa /mesalib/src/mesa/SConscript | |
| parent | 4d64875593956234795d9947ac1d225e5b110f0f (diff) | |
| parent | 7c20de6c7fb53ed404d4df0d975328318810ce01 (diff) | |
| download | vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.tar.gz vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.tar.bz2 vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libXext mesa xkeyboard-config pixman 18 nov 2013
Conflicts:
libXext/src/eat.h
Diffstat (limited to 'mesalib/src/mesa/SConscript')
| -rw-r--r-- | mesalib/src/mesa/SConscript | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript index 42134983c..a2bb9f131 100644 --- a/mesalib/src/mesa/SConscript +++ b/mesalib/src/mesa/SConscript @@ -18,9 +18,6 @@ env.Append(CPPPATH = [ Dir('.'), # src/mesa build path ]) -enabled_apis = [] -enabled_apis += ['GL'] - if env['platform'] == 'windows': env.Append(CPPDEFINES = [ '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers @@ -340,10 +337,6 @@ mesa_sources = ( GLAPI = '#src/mapi/glapi/' -if env['gles']: - - enabled_apis += ['ES1', 'ES2'] - get_hash_header = env.CodeGenerate( target = 'main/get_hash.h', script = 'main/get_hash_generator.py', |