diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-01-22 02:13:10 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-01-22 02:13:10 +0000 |
| commit | 2ebab484cac65c01dd19e8c1b62eb58c83074390 (patch) | |
| tree | d5decbcdfb7743214078cb8e0b0372a59c2ca6d6 /lib/mesa/src/gallium/winsys | |
| parent | c5f75a531a75824f9087ebabbb1d9ff34a17d110 (diff) | |
Import Mesa 19.2.8
Diffstat (limited to 'lib/mesa/src/gallium/winsys')
5 files changed, 1 insertions, 12 deletions
diff --git a/lib/mesa/src/gallium/winsys/amdgpu/drm/Android.mk b/lib/mesa/src/gallium/winsys/amdgpu/drm/Android.mk index 90f56e45b..0b8edf972 100644 --- a/lib/mesa/src/gallium/winsys/amdgpu/drm/Android.mk +++ b/lib/mesa/src/gallium/winsys/amdgpu/drm/Android.mk @@ -21,8 +21,6 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -ifeq ($(MESA_ENABLE_LLVM),true) - LOCAL_PATH := $(call my-dir) # get C_SOURCES @@ -48,5 +46,3 @@ ifneq ($(HAVE_GALLIUM_RADEONSI),) $(eval GALLIUM_LIBS += $(LOCAL_MODULE) $(LOCAL_STATIC_LIBRARIES)) $(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) endif - -endif # MESA_ENABLE_LLVM==true diff --git a/lib/mesa/src/gallium/winsys/etnaviv/drm/Android.mk b/lib/mesa/src/gallium/winsys/etnaviv/drm/Android.mk index 31edabd68..32091bea0 100644 --- a/lib/mesa/src/gallium/winsys/etnaviv/drm/Android.mk +++ b/lib/mesa/src/gallium/winsys/etnaviv/drm/Android.mk @@ -25,7 +25,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) -LOCAL_STATIC_LIBRARIES := libmesa_nir libetnaviv_drm +LOCAL_SHARED_LIBRARIES := libdrm_etnaviv LOCAL_MODULE := libmesa_winsys_etnaviv diff --git a/lib/mesa/src/gallium/winsys/freedreno/drm/Android.mk b/lib/mesa/src/gallium/winsys/freedreno/drm/Android.mk index 669559583..09edab391 100644 --- a/lib/mesa/src/gallium/winsys/freedreno/drm/Android.mk +++ b/lib/mesa/src/gallium/winsys/freedreno/drm/Android.mk @@ -27,9 +27,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/freedreno/common - LOCAL_SHARED_LIBRARIES := libdrm_freedreno LOCAL_STATIC_LIBRARIES := libfreedreno_registers diff --git a/lib/mesa/src/gallium/winsys/virgl/drm/Android.mk b/lib/mesa/src/gallium/winsys/virgl/drm/Android.mk index f3d9df79c..5e2500774 100644 --- a/lib/mesa/src/gallium/winsys/virgl/drm/Android.mk +++ b/lib/mesa/src/gallium/winsys/virgl/drm/Android.mk @@ -29,8 +29,6 @@ LOCAL_SRC_FILES := $(C_SOURCES) LOCAL_MODULE := libmesa_winsys_virgl -LOCAL_C_INCLUDES := $(MESA_TOP)/src/virtio - LOCAL_STATIC_LIBRARIES := libmesa_winsys_virgl_common include $(GALLIUM_COMMON_MK) diff --git a/lib/mesa/src/gallium/winsys/virgl/vtest/Android.mk b/lib/mesa/src/gallium/winsys/virgl/vtest/Android.mk index 454d830d0..5b33f6771 100644 --- a/lib/mesa/src/gallium/winsys/virgl/vtest/Android.mk +++ b/lib/mesa/src/gallium/winsys/virgl/vtest/Android.mk @@ -29,8 +29,6 @@ LOCAL_SRC_FILES := $(C_SOURCES) LOCAL_MODULE := libmesa_winsys_virgl_vtest -LOCAL_C_INCLUDES := $(MESA_TOP)/src/virtio - LOCAL_STATIC_LIBRARIES := libmesa_winsys_virgl_common include $(GALLIUM_COMMON_MK) |