diff options
| author | Emil Velikov <[email protected]> | 2016-12-05 21:32:30 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-05-19 19:44:09 +0100 |
| commit | f353f844a08c78f2aa225165c05dae31f5700845 (patch) | |
| tree | 88de044c90a7f3fb07956366920c9bc5c89a9b6a | |
| parent | 2d35773221d63658bb764f90bd7be95f910f6309 (diff) | |
configure: set HAVE_foo_PLATFORM as applicable
Rather than having multiple places that define the macros, do it just
once in configure. Makes existing code a bit shorter and easier to
manage as we fix the VL targets with follow-up commits.
Cc: [email protected]
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/egl/Makefile.am | 5 | ||||
| -rw-r--r-- | src/gbm/Makefile.am | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index f741efcb7c7..56521127b4c 100644 --- a/configure.ac +++ b/configure.ac @@ -1684,22 +1684,27 @@ for plat in $platforms; do if test "x$WAYLAND_SCANNER" = "x:"; then AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) fi + DEFINES="$DEFINES -DHAVE_WAYLAND_PLATFORM" ;; x11) PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED xcb-xfixes]) + DEFINES="$DEFINES -DHAVE_X11_PLATFORM" ;; drm) test "x$enable_gbm" = "xno" && AC_MSG_ERROR([EGL platform drm needs gbm]) + DEFINES="$DEFINES -DHAVE_DRM_PLATFORM" ;; surfaceless) + DEFINES="$DEFINES -DHAVE_SURFACELESS_PLATFORM" ;; android) PKG_CHECK_MODULES([ANDROID], [cutils hardware sync]) + DEFINES="$DEFINES -DHAVE_ANDROID_PLATFORM" ;; *) diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am index 1fb568f6cf8..14fd77f14a9 100644 --- a/src/egl/Makefile.am +++ b/src/egl/Makefile.am @@ -47,7 +47,6 @@ dri2_backend_FILES = dri3_backend_FILES = if HAVE_PLATFORM_X11 -AM_CFLAGS += -DHAVE_X11_PLATFORM AM_CFLAGS += $(XCB_DRI2_CFLAGS) libEGL_common_la_LIBADD += $(XCB_DRI2_LIBS) dri2_backend_FILES += drivers/dri2/platform_x11.c @@ -62,7 +61,6 @@ endif endif if HAVE_PLATFORM_WAYLAND -AM_CFLAGS += -DHAVE_WAYLAND_PLATFORM AM_CFLAGS += $(WAYLAND_CFLAGS) libEGL_common_la_LIBADD += $(WAYLAND_LIBS) libEGL_common_la_LIBADD += $(LIBDRM_LIBS) @@ -71,18 +69,15 @@ dri2_backend_FILES += drivers/dri2/platform_wayland.c endif if HAVE_PLATFORM_DRM -AM_CFLAGS += -DHAVE_DRM_PLATFORM libEGL_common_la_LIBADD += $(top_builddir)/src/gbm/libgbm.la dri2_backend_FILES += drivers/dri2/platform_drm.c endif if HAVE_PLATFORM_SURFACELESS -AM_CFLAGS += -DHAVE_SURFACELESS_PLATFORM dri2_backend_FILES += drivers/dri2/platform_surfaceless.c endif if HAVE_PLATFORM_ANDROID -AM_CFLAGS += -DHAVE_ANDROID_PLATFORM AM_CFLAGS += $(ANDROID_CFLAGS) libEGL_common_la_LIBADD += $(ANDROID_LIBS) dri2_backend_FILES += drivers/dri2/platform_android.c diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am index e34c1d4b1f5..60b09245065 100644 --- a/src/gbm/Makefile.am +++ b/src/gbm/Makefile.am @@ -28,7 +28,6 @@ libgbm_la_LIBADD = \ $(DLOPEN_LIBS) if HAVE_PLATFORM_WAYLAND -AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM AM_CFLAGS += $(WAYLAND_CFLAGS) libgbm_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la $(WAYLAND_LIBS) endif |