diff options
| author | Jason Ekstrand <[email protected]> | 2015-08-14 17:25:04 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-08-17 11:25:03 -0700 |
| commit | 6a7ca4ef2cd3f39d3b5e77051cb3f3175e9e60df (patch) | |
| tree | d5413781ac9e9ecfc22cf403fa7465d6a7cadb34 /src/gallium/targets/dri/Android.mk | |
| parent | b4c02253c4e1a7bc5a7a6369045210932f5de605 (diff) | |
| parent | d3e23f1ff915c01541f8df375b50b93b3da565a8 (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
Diffstat (limited to 'src/gallium/targets/dri/Android.mk')
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 5ba129b7961..7168e1dbfb3 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -35,17 +35,15 @@ endif LOCAL_SRC_FILES := target.c -LOCAL_CFLAGS := -DDRI_TARGET -DHAVE_LIBDRM +LOCAL_CFLAGS := -DDRI_TARGET LOCAL_SHARED_LIBRARIES := \ libdl \ libglapi \ libexpat \ -# swrast only? -ifeq ($(MESA_GPU_DRIVERS),swrast) -LOCAL_CFLAGS += -D__NOT_HAVE_DRM_H -else +ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),) +LOCAL_CFLAGS += -DHAVE_LIBDRM LOCAL_SHARED_LIBRARIES += libdrm endif @@ -87,7 +85,7 @@ gallium_DRIVERS += libmesa_winsys_radeon libmesa_pipe_radeon LOCAL_SHARED_LIBRARIES += libdrm_radeon endif ifneq ($(filter swrast,$(MESA_GPU_DRIVERS)),) -gallium_DRIVERS += libmesa_pipe_softpipe libmesa_winsys_sw_dri libmesa_winsys_sw_kms_dri +gallium_DRIVERS += libmesa_pipe_softpipe libmesa_winsys_sw_dri LOCAL_CFLAGS += -DGALLIUM_SOFTPIPE endif ifneq ($(filter vc4,$(MESA_GPU_DRIVERS)),) |