diff options
| author | Jason Ekstrand <[email protected]> | 2015-08-14 17:25:04 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-08-17 11:25:03 -0700 |
| commit | 6a7ca4ef2cd3f39d3b5e77051cb3f3175e9e60df (patch) | |
| tree | d5413781ac9e9ecfc22cf403fa7465d6a7cadb34 /src/SConscript | |
| parent | b4c02253c4e1a7bc5a7a6369045210932f5de605 (diff) | |
| parent | d3e23f1ff915c01541f8df375b50b93b3da565a8 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/SConscript')
| -rw-r--r-- | src/SConscript | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/SConscript b/src/SConscript index b0578e89258..106b87d4251 100644 --- a/src/SConscript +++ b/src/SConscript @@ -31,13 +31,8 @@ SConscript('mesa/SConscript') if not env['embedded']: if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'): SConscript('glx/SConscript') - if env['platform'] not in ['darwin', 'haiku', 'sunos', 'windows']: - if env['dri']: - SConscript('egl/drivers/dri2/SConscript') - SConscript('egl/main/SConscript') if env['platform'] == 'haiku': - SConscript('egl/drivers/haiku/SConscript') - SConscript('egl/main/SConscript') + SConscript('egl/SConscript') if env['gles']: SConscript('mapi/shared-glapi/SConscript') |