diff options
| author | Emil Velikov <[email protected]> | 2017-09-27 17:36:29 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-10-02 16:26:46 +0100 |
| commit | d884d8d0077c16d459b11699c552184dfec581b2 (patch) | |
| tree | 86c5680dc33479c9394a58dd05ab565569381737 /src/egl/Makefile.am | |
| parent | 21e271024d8e050b75361c2da2e5783100f2e87b (diff) | |
egl/dri: link directly to libglapi.so
Shared glapi (libglapi.so) has been a requirement for years, in order
to build EGL.
Remove the no longer necessary dlopen/dlsym dance and link to the
library directly.
This allows us to remove a handful of platform specific workarounds, due
to the different name of the library.
v2:
- Android: export the include dir (RobH)
- Drop unused local variable (Eric)
Cc: Jonathan Gray <[email protected]>
Cc: Jon Turney <[email protected]>
Cc: Julien Isorce <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]> (v1)
Tested-by: Tomasz Figa <[email protected]> (v1)
Tested-by: Rob Herring <[email protected]>
Diffstat (limited to 'src/egl/Makefile.am')
| -rw-r--r-- | src/egl/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am index f140f5d6412..eeb745f973a 100644 --- a/src/egl/Makefile.am +++ b/src/egl/Makefile.am @@ -27,6 +27,7 @@ BUILT_SOURCES = AM_CFLAGS = \ -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/egl/main \ -I$(top_srcdir)/src/gbm/main \ -I$(top_srcdir)/src \ @@ -45,6 +46,7 @@ libEGL_common_la_SOURCES = \ $(LIBEGL_C_FILES) libEGL_common_la_LIBADD = \ + $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ $(top_builddir)/src/util/libmesautil.la \ $(EGL_LIB_DEPS) |