* Revert change to egl main producing Shared Libraries
* Check for dri before including dri code
---
src/SConscript | 3 ++-
src/egl/main/SConscript | 17 +++++++----------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/SConscript b/src/SConscript
index eb4cd3c..c25adc7 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 2ea2261..5d0073e 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,
)
--
1.7.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
