diff options
| author | Emil Velikov <[email protected]> | 2015-07-14 01:52:51 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-07-22 16:35:26 +0100 |
| commit | 78674631a2d0ff1eb538470e2a1d516201361f03 (patch) | |
| tree | 92dccdeb471206f7eaea65b1f33532686ece9e69 /src/egl/main | |
| parent | ce2a4bd541241dade00a36e9f2d8e5ca16c6ff03 (diff) | |
egl: remove the non-haiku scons build
It has been broken since 2011 with commit c98ea26e16b(egl: Make
egl_dri2 and egl_glx built-in drivers.). When the backends got merged
into the main library each entry point was guarded by a
_EGL_BUILT_IN_DRIVER_* define.
As the define was missing, the linker kindly removed the whole of the
dri2 backend, thus we did not notice any errors due to the unresolved
link to xcb and friends.
Cc: Chia-I Wu <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Matt Turner <[email protected]>
Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/egl/main')
| -rw-r--r-- | src/egl/main/SConscript | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/src/egl/main/SConscript b/src/egl/main/SConscript index c0012831bb9..6fc13416a5d 100644 --- a/src/egl/main/SConscript +++ b/src/egl/main/SConscript @@ -10,29 +10,14 @@ env.Append(CPPDEFINES = [ '_EGL_DRIVER_SEARCH_DIR=\\"\\"', ]) -if env['platform'] == 'haiku': - env.Append(CPPDEFINES = [ - '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_HAIKU', - '_EGL_OS_UNIX', - '_EGL_BUILT_IN_DRIVER_HAIKU', - ]) - env.Prepend(LIBS = [ - egl_haiku, - libloader, - ]) -else: - env.Append(CPPDEFINES = [ - '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_X11', - '_EGL_OS_UNIX', - ]) - if env['dri']: - env.Prepend(LIBS = [ - egl_dri2, - libloader, - ]) - # Disallow undefined symbols - if env['platform'] != 'darwin': - env.Append(SHLINKFLAGS = ['-Wl,-z,defs']) +env.Append(CPPDEFINES = [ + '_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_HAIKU', + '_EGL_OS_UNIX', + '_EGL_BUILT_IN_DRIVER_HAIKU', +]) +env.Prepend(LIBS = [ + egl_haiku, +]) env.Append(CPPPATH = [ '#/include', |