diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/Android.mk | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/pipe-loader/Android.mk | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/softpipe/Android.mk | 4 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/Android.mk | 1 | ||||
| -rw-r--r-- | src/gallium/winsys/sw/kms-dri/Android.mk | 33 |
5 files changed, 38 insertions, 3 deletions
diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk index c5f31ef0ac6..21a1620974e 100644 --- a/src/gallium/Android.mk +++ b/src/gallium/Android.mk @@ -34,7 +34,7 @@ SUBDIRS += auxiliary/pipe-loader # Gallium drivers and their respective winsys # -SUBDIRS += winsys/sw/dri drivers/softpipe +SUBDIRS += winsys/sw/kms-dri winsys/sw/dri drivers/softpipe SUBDIRS += winsys/freedreno/drm drivers/freedreno SUBDIRS += winsys/i915/drm drivers/i915 SUBDIRS += winsys/nouveau/drm drivers/nouveau diff --git a/src/gallium/auxiliary/pipe-loader/Android.mk b/src/gallium/auxiliary/pipe-loader/Android.mk index ab844143c30..075bf8af436 100644 --- a/src/gallium/auxiliary/pipe-loader/Android.mk +++ b/src/gallium/auxiliary/pipe-loader/Android.mk @@ -30,6 +30,7 @@ include $(CLEAR_VARS) LOCAL_CFLAGS := \ -DHAVE_PIPE_LOADER_DRI \ + -DHAVE_PIPE_LOADER_KMS \ -DDROP_PIPE_LOADER_MISC \ -DGALLIUM_STATIC_TARGETS diff --git a/src/gallium/drivers/softpipe/Android.mk b/src/gallium/drivers/softpipe/Android.mk index 29cc317327c..7e879161090 100644 --- a/src/gallium/drivers/softpipe/Android.mk +++ b/src/gallium/drivers/softpipe/Android.mk @@ -37,6 +37,6 @@ include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) ifneq ($(HAVE_GALLIUM_SOFTPIPE),) -GALLIUM_TARGET_DRIVERS += swrast -$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_sw_dri) +GALLIUM_TARGET_DRIVERS += swrast kms_swrast +$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_sw_dri libmesa_winsys_sw_kms_dri) endif diff --git a/src/gallium/state_trackers/dri/Android.mk b/src/gallium/state_trackers/dri/Android.mk index a867e50d86c..d6f8a6ed247 100644 --- a/src/gallium/state_trackers/dri/Android.mk +++ b/src/gallium/state_trackers/dri/Android.mk @@ -44,6 +44,7 @@ LOCAL_STATIC_LIBRARIES := \ ifneq ($(HAVE_GALLIUM_SOFTPIPE),) LOCAL_SRC_FILES += $(drisw_SOURCES) +LOCAL_CFLAGS += -DGALLIUM_SOFTPIPE endif LOCAL_MODULE := libmesa_st_dri diff --git a/src/gallium/winsys/sw/kms-dri/Android.mk b/src/gallium/winsys/sw/kms-dri/Android.mk new file mode 100644 index 00000000000..f5c1ccab12a --- /dev/null +++ b/src/gallium/winsys/sw/kms-dri/Android.mk @@ -0,0 +1,33 @@ +# +# Copyright (C) 2017 Linaro, Ltd., Rob Herring <[email protected]> +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +LOCAL_PATH := $(call my-dir) + +include $(LOCAL_PATH)/Makefile.sources + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(C_SOURCES) + +LOCAL_MODULE := libmesa_winsys_sw_kms_dri + +include $(GALLIUM_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) |