|
 |
fe17fa |
From d56f21c494b315306215c4730835a9b291360e9b Mon Sep 17 00:00:00 2001
|
|
|
fe17fa |
From: Eric Anholt <eric@anholt.net>
|
|
|
fe17fa |
Date: Fri, 13 Jun 2014 14:59:37 -0700
|
|
|
fe17fa |
Subject: [PATCH 1/3] Use the EGL pkgconfig for finding eglplatform.h.
|
|
|
fe17fa |
|
|
|
fe17fa |
We don't ever explicity link against libEGL, so no need to make use of
|
|
|
fe17fa |
EGL_LIBS.
|
|
|
fe17fa |
|
|
|
fe17fa |
Fixes #30.
|
|
|
fe17fa |
---
|
|
|
fe17fa |
configure.ac | 1 +
|
|
|
fe17fa |
src/Makefile.am | 1 +
|
|
|
fe17fa |
test/Makefile.am | 4 +++-
|
|
|
fe17fa |
3 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
fe17fa |
|
|
|
fe17fa |
diff --git a/configure.ac b/configure.ac
|
|
|
fe17fa |
index 399e351..f97c9b0 100644
|
|
|
fe17fa |
--- a/configure.ac
|
|
|
fe17fa |
+++ b/configure.ac
|
|
|
fe17fa |
@@ -98,6 +98,7 @@ AC_SUBST(EPOXY_LINK_LIBS)
|
|
|
fe17fa |
|
|
|
fe17fa |
AM_CONDITIONAL(BUILD_EGL, test x$build_egl = xyes)
|
|
|
fe17fa |
if test x$build_egl = xyes; then
|
|
|
fe17fa |
+ PKG_CHECK_MODULES(EGL, [egl])
|
|
|
fe17fa |
AC_DEFINE([BUILD_EGL], [1], [build EGL tests])
|
|
|
fe17fa |
fi
|
|
|
fe17fa |
|
|
|
fe17fa |
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
|
fe17fa |
index 8e20cd6..49c3507 100644
|
|
|
fe17fa |
--- a/src/Makefile.am
|
|
|
fe17fa |
+++ b/src/Makefile.am
|
|
|
fe17fa |
@@ -28,6 +28,7 @@ AM_CFLAGS = \
|
|
|
fe17fa |
$(CWARNFLAGS) \
|
|
|
fe17fa |
$(VISIBILITY_CFLAGS) \
|
|
|
fe17fa |
$(X11_CFLAGS) \
|
|
|
fe17fa |
+ $(EGL_CFLAGS) \
|
|
|
fe17fa |
$()
|
|
|
fe17fa |
|
|
|
fe17fa |
epoxyincludedir = $(includedir)/epoxy
|
|
|
fe17fa |
diff --git a/test/Makefile.am b/test/Makefile.am
|
|
|
fe17fa |
index ffb330e..f29baca 100644
|
|
|
fe17fa |
--- a/test/Makefile.am
|
|
|
fe17fa |
+++ b/test/Makefile.am
|
|
|
fe17fa |
@@ -46,7 +46,9 @@ libwgl_common_la_LIBADD = $(EPOXY)
|
|
|
fe17fa |
AM_CPPFLAGS = \
|
|
|
fe17fa |
-I$(top_srcdir)/include \
|
|
|
fe17fa |
-I$(top_builddir)/include \
|
|
|
fe17fa |
- $(X11_CFLAGS)
|
|
|
fe17fa |
+ $(X11_CFLAGS) \
|
|
|
fe17fa |
+ $(EGL_CFLAGS) \
|
|
|
fe17fa |
+ $()
|
|
|
fe17fa |
|
|
|
fe17fa |
AM_CFLAGS = $(CWARNFLAGS)
|
|
|
fe17fa |
|
|
|
fe17fa |
--
|
|
|
fe17fa |
1.9.3
|
|
|
fe17fa |
|