diff options
| author | Alexander von Gluck IV <[email protected]> | 2014-12-24 07:44:25 -0600 |
|---|---|---|
| committer | Alexander von Gluck IV <[email protected]> | 2014-12-25 10:34:49 -0500 |
| commit | 890ef622d63cb1caa3f84dd04dc2442324e2b0f2 (patch) | |
| tree | c6a0a83f4e70a0911710f3c255434d40ac7207ea | |
| parent | b3057f8097f88d9072df6d9c09bcc8c039b88a7c (diff) | |
egl: Fix non-dri SCons builds re #87657
* Revert change to egl main producing Shared Libraries
* Check for dri before including dri code
| -rw-r--r-- | src/SConscript | 3 | ||||
| -rw-r--r-- | src/egl/main/SConscript | 17 |
2 files changed, 9 insertions, 11 deletions
diff --git a/src/SConscript b/src/SConscript index eb4cd3c7c9f..c25adc7280f 100644 --- a/src/SConscript +++ b/src/SConscript @@ -33,7 +33,8 @@ 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']: - SConscript('egl/drivers/dri2/SConscript') + if env['dri']: + SConscript('egl/drivers/dri2/SConscript') SConscript('egl/main/SConscript') if env['platform'] == 'haiku': SConscript('egl/drivers/haiku/SConscript') diff --git a/src/egl/main/SConscript b/src/egl/main/SConscript index 2ea2261cc13..5d0073e14e0 100644 --- a/src/egl/main/SConscript +++ b/src/egl/main/SConscript @@ -33,10 +33,11 @@ else: '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_X11', '_EGL_OS_UNIX', ]) - env.Prepend(LIBS = [ - egl_dri2, - libloader, - ]) + if env['dri']: + env.Prepend(LIBS = [ + egl_dri2, + libloader, + ]) env.Append(CPPPATH = [ '#/include', @@ -46,12 +47,8 @@ env.Append(CPPPATH = [ # parse Makefile.sources egl_sources = env.ParseSourceList('Makefile.sources', 'LIBEGL_C_FILES') -# libEGL.dll -env['LIBPREFIX'] = 'lib' -env['SHLIBPREFIX'] = 'lib' - -egl = env.SharedLibrary( - target = 'EGL', +egl = env.ConvenienceLibrary( + target = 'egl', source = egl_sources, ) |