From 095c37e47230125d7fdc4a6b148b8e5cdc2f7262 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Thu, 31 Jul 2014 16:30:37 +0100 Subject: [PATCH] target-helpers: Do not build kms_dri on libdrm-less platforms. Fix build since 3b176c441b7ddc5f7d2f891da3f76cf3c1814ce1 for dri_platform=none hosts. Signed-off-by: Jon TURNEY Reviewed-by: Emil Velikov --- src/gallium/auxiliary/target-helpers/inline_drm_helper.h | 2 ++ src/gallium/targets/dri/Makefile.am | 1 + 2 files changed, 3 insertions(+) diff --git a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h index 751ceb1e70e..5d02da7290c 100644 --- a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h +++ b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h @@ -60,6 +60,7 @@ static char* driver_name = NULL; #if defined(GALLIUM_SOFTPIPE) #if defined(DRI_TARGET) +#if defined(HAVE_LIBDRM) const __DRIextension **__driDriverGetExtensions_kms_swrast(void); @@ -84,6 +85,7 @@ kms_swrast_create_screen(int fd) } #endif #endif +#endif #if defined(GALLIUM_I915) #if defined(DRI_TARGET) diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index c7fe4106ab0..6ab15d8233c 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -8,6 +8,7 @@ AM_CFLAGS = \ $(GALLIUM_TARGET_CFLAGS) AM_CPPFLAGS = \ + $(DEFINES) \ -DDRI_TARGET \ -DGALLIUM_GALAHAD \ -DGALLIUM_NOOP \ -- 2.30.2