Attachment 111257 Details for Bug 87654 – Fix v2

[patch] Fix v2

eglFixv2.diff (text/plain), 1.07 KB, created by Alexander von Gluck on 2014-12-24 04:29:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander von Gluck

Created: 2014-12-24 04:29:40 UTC

Size: 1.07 KB

patch

obsolete

>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..89ca2fa 100644
>--- a/src/egl/main/SConscript
>+++ b/src/egl/main/SConscript
>@@ -46,12 +46,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,
> )
>

Actions: View | Splinter Review

Attachments on bug 87654: 111250 | 111257

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.